diff --git a/views/forestay/createUpdate.ejs b/views/forestay/createUpdate.ejs
index 7484003..2c45d84 100644
--- a/views/forestay/createUpdate.ejs
+++ b/views/forestay/createUpdate.ejs
@@ -157,16 +157,7 @@
                   <input id="attr-<%= attrKey %>"  style="width:100%" type="number" name="<%= attrKey %>" class="number-input number-input-<%= attrKey %>" <%- value %> <%= required %> <%= attributeMutable %>>
                   <div id="error-<%= attrKey %>" class="alert alert-danger"></div>
                 <% } else if(attributeType == "text"){ %>
-                  <textarea id="attr-<%= attrKey %>"
-                    style="width:100%; height: 200px"
-                    name="<%= attrKey %>"
-                    class="text-input text-input-<%= attrKey %>"
-                    <%= required %>
-                    <%= attributeMutable %> >
-                    <%if(forestay.id){ %><%- record[attrKey]%><% } else { %>
-                    <%= attributeValue %>
-                    <% } %>
-                  </textarea>
+                  <textarea id="attr-<%= attrKey %>"  style="width:100%; height: 200px" name="<%= attrKey %>" class="text-input text-input-<%= attrKey %>" <%= required %> <%= attributeMutable %> ><%if(forestay.id){ %><%- record[attrKey]%><% } %></textarea>
                   <div id="error-<%= attrKey %>" class="alert alert-danger"></div>
                 <% } else if(attributeType == "boolean"){
                     var trueSelected = ""
@@ -205,10 +196,10 @@
                     <% }) %>
                 </select>
                 <div id="error-<%= attrKey %>" class="alert alert-danger"></div>
-                <% } else if (attributeType == "collection"){ %>
-                  <%- include createUpdateCollections.ejs %>
+                <% } else if (attributeType == "collection") { %>
+                  <%- include ("./createUpdateCollections", { attrKey: attrKey }) %>
                 <% } else if (attributeType == "model"){ %>
-                  <%- include createUpdateModels.ejs %>
+                  <%- include ("./createUpdateModels", { attrKey: attrKey, required: required, attributeMutable: attributeMutable }) %>
                 <% }else { // unknown attribute type %>
                   (can't edit <strong><%= attributeType %></strong> attributes at this time)
                   <% }%>
diff --git a/views/forestay/createUpdateCollections.ejs b/views/forestay/createUpdateCollections.ejs
index 727b8a2..ee8e3e7 100644
--- a/views/forestay/createUpdateCollections.ejs
+++ b/views/forestay/createUpdateCollections.ejs
@@ -2,7 +2,7 @@
   <p>Please add attribute <strong>populateBy</strong> to your model to display these optoins, or hide this field from the form.</p>
   <% } else { %>
     <% if (_.get(forestay.config.attributes[attrKey], ["meta","forestay","createUpdateUi"]) === 'tagging') { %>
-      <% include createUpdateCollectionsTagging.ejs %>
+      <% include ("./createUpdateCollectionsTagging") %>
     <% } else { // end createUpdateUi Type%>
       <%
       var cpt=0;
diff --git a/views/forestay/index.ejs b/views/forestay/index.ejs
index 8bdcd21..5ba52c5 100644
--- a/views/forestay/index.ejs
+++ b/views/forestay/index.ejs
@@ -141,7 +141,7 @@
               <% var value = "" %>
               <% if (typeof _.get(forestay.filter,[attrKey]) != "undefined") value = forestay.filter[attrKey] %>
               <% if (attributeType == "model"){ %>
-                <% include filterByModel.ejs %>
+                <%- include ("./filterByModel",{ attrKey: attrKey, value: value }); %>
               <% } else if (attributeType == "string" || attributeType == "number"){ %>
                 <input value="<%= value %>" name="<%= attrKey %>">
                 <% } else if (attributeType == "boolean"){ %>
@@ -305,7 +305,7 @@
       </td>
       <% } %>
 
-      <% include indexActionsRecordRow.ejs %>
+      <%- include ("./indexActionsRecordRow"); %>
       <% if(_.get(forestay,['config','forestay','index','hideEditButton']) !== true){ %>
         <td>
           <a href="<%= _.get(forestay, ["config","forestay","urlPrefix"]) %><%= row.id %>/edit" class="btn btn-info btn-sm">Edit</a>