diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js
index 06de14963e..141e7184f1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js
@@ -37,11 +37,6 @@
                 $scope.model.title = "Insert value";
             }
 
-            // set default subtitle
-            if(!$scope.model.subtitle) {
-                $scope.model.subtitle = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.";
-            }
-
             // Load all fields
             contentTypeResource.getAllPropertyTypeAliases().then(function (array) {
                 vm.properties = array;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
index 773aebd364..161be5060a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
@@ -53,7 +53,6 @@
                 <div class="controls">
                     <label class="control-label" for="recursive">
                         Recursive
-                        <small>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</small>
                     </label>
                     <input type="checkbox" name="recursive" ng-model="vm.recursive">
                     Yes, make it recursive
@@ -87,7 +86,6 @@
                     <div>
                         <label class="control-label">
                             Casing
-                            <small>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</small>
                         </label>
                     </div>
                     <a href ng-click="vm.setCasingOption('uppercase')" class="btn" style="text-transform: uppercase;"><i class="icon icon-check" ng-if="vm.casingUpper"></i> Uppercase</a>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.controller.js
index 31eeab0008..cb5da443b6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.controller.js
@@ -19,10 +19,10 @@
 
         function onInit() {
 
-            if($scope.model.isMasterTemplate) {
-                $scope.model.insertType = 'renderBody';
-            } else {
+            if($scope.model.hasMaster) {
                 $scope.model.insertType = 'addSection';
+            } else {
+                $scope.model.insertType = 'renderBody';
             }
 
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.html
index 2c3b7f0147..36af4a2798 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.html
@@ -1,6 +1,6 @@
 <div ng-controller="Umbraco.Overlays.TemplateSectionsOverlay as vm">
 
-    <div class="umb-insert-code-box" ng-click="vm.select('renderBody')">
+    <div ng-if="!model.hasMaster" class="umb-insert-code-box" ng-click="vm.select('renderBody')">
         <div class="umb-insert-code-box__check" ng-class="{'umb-insert-code-box__check--checked': model.insertType === 'renderBody'  }"><i class="icon icon-check"></i></div>
         <div class="umb-insert-code-box__title">Render child template</div>
         <div class="umb-insert-code-box__description">
@@ -9,7 +9,7 @@
         </div>
     </div>
 
-    <div class="umb-insert-code-box" ng-click="vm.select('renderSection')">
+    <div ng-if="!model.hasMaster" class="umb-insert-code-box" ng-click="vm.select('renderSection')">
 
         <div class="umb-insert-code-box__check" ng-class="{'umb-insert-code-box__check--checked': model.insertType === 'renderSection' }"><i class="icon icon-check"></i></div>
         <div class="umb-insert-code-box__title">Render a named section</div>
diff --git a/src/Umbraco.Web/Editors/TemplateQueryController.cs b/src/Umbraco.Web/Editors/TemplateQueryController.cs
index 2720847890..b6e086d7cc 100644
--- a/src/Umbraco.Web/Editors/TemplateQueryController.cs
+++ b/src/Umbraco.Web/Editors/TemplateQueryController.cs
@@ -65,9 +65,8 @@ namespace Umbraco.Web.Editors
 
             var sb = new StringBuilder();
             var indention = Environment.NewLine + "\t\t\t\t\t\t";
-
+      
             sb.Append("Model.Content.Site()");
-            
             var timer = new Stopwatch();
             
             timer.Start();