diff --git a/ehr/resources/web/ehr/navMenu.js b/ehr/resources/web/ehr/navMenu.js
index 74bbd49af..8f4d6048c 100644
--- a/ehr/resources/web/ehr/navMenu.js
+++ b/ehr/resources/web/ehr/navMenu.js
@@ -107,11 +107,19 @@ Ext4.define('EHR.NavMenu', {
                     item = this.renderer(tmp.items[j])
                 }
                 else {
-                   //NOTE: this is the default renderer
-                   item = {
-                       //Creates links for the navigation panel
-                        html: '<a href="'+tmp.items[j].url+'">'+tmp.items[j].name+'</a>'
+                    if (tmp.items[j].target){
+                        item = {
+                            //Creates links for the navigation panel to a target
+                            html: '<a target="'+tmp.items[j].target+'" href="'+tmp.items[j].url+'">'+tmp.items[j].name+'</a>'
+                        }
+                    }else{
+                        item = {
+                            //Creates links for the navigation panel
+                            html: '<a href="'+tmp.items[j].url+'">'+tmp.items[j].name+'</a>'
+                        }
                     }
+                   //NOTE: this is the default renderer
+
                 }
                 section.add(item)
             }
diff --git a/ehr/resources/web/ehr/window/SaveTemplateWindow.js b/ehr/resources/web/ehr/window/SaveTemplateWindow.js
index 6a727c2ac..63d222e80 100644
--- a/ehr/resources/web/ehr/window/SaveTemplateWindow.js
+++ b/ehr/resources/web/ehr/window/SaveTemplateWindow.js
@@ -204,7 +204,8 @@ Ext4.define('EHR.window.SaveTemplateWindow', {
         var rows = [];
 
         this.down('#theForm').items.each(function(tab){
-            var selections = tab.down('#recordSelector').getValue().inputValue;
+            var radioGroup = tab.down('#recordSelector');
+            var selections = radioGroup.getValue()[radioGroup.down('[name]').name];
             var fields = tab.down('#fieldSelector').getValue().fields;
 
             if (!fields.length)
@@ -220,7 +221,7 @@ Ext4.define('EHR.window.SaveTemplateWindow', {
 
             var records = [];
             if (selections == 'selected'){
-                records = this.grid.getSelectionModel().getSelections();
+                records = this.targetGrid.getSelectionModel().getSelection();
 
                 if (!records.length){
                     Ext4.Msg.hide();