diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js
index 68c1a4b..634ccd4 100644
--- a/submodules/groups/groups.js
+++ b/submodules/groups/groups.js
@@ -1148,7 +1148,7 @@ define(function(require){
 							template.find('.spare-link').addClass('disabled');
 						}
 					}
-				}
+				};
 
 				monster.pub('common.numbers.dialogSpare', args);
 			});
@@ -1160,16 +1160,15 @@ define(function(require){
 					searchType: $(this).data('type'),
 					callbacks: {
 						success: function(numbers) {
-
 							monster.pub('common.numbers.getListFeatures', function(features) {
 								_.each(numbers, function(number, k) {
 									number.viewFeatures = $.extend(true, {}, features);
 									number.phoneNumber = number.id;
 
-									var rowTemplate = monster.template(self, 'groups-numbersItemRow', {
+									var rowTemplate = $(monster.template(self, 'groups-numbersItemRow', {
 										isE911Enabled: monster.util.isNumberFeatureEnabled('e911'),
 										number: number
-									});
+									}));
 
 									monster.ui.tooltips(rowTemplate);
 
@@ -1464,7 +1463,9 @@ define(function(require){
 					number.localityEnabled = 'locality' in number ? true : false;
 
 					_.each(number.features, function(feature) {
-						number.viewFeatures[feature].active = 'active';
+						if(feature in number.viewFeatures) {
+							number.viewFeatures[feature].active = 'active';
+						}
 					});
 
 					if(number.used_by === '') {
diff --git a/submodules/users/users.js b/submodules/users/users.js
index e1e52a0..dad98a6 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -1074,6 +1074,7 @@ define(function(require){
 
 			template.on('click', '.actions .buy-link', function(e) {
 				e.preventDefault();
+
 				monster.pub('common.buyNumbers', {
 					searchType: $(this).data('type'),
 					callbacks: {
@@ -1083,10 +1084,10 @@ define(function(require){
 									number.viewFeatures = $.extend(true, {}, features);
 									number.phoneNumber = number.id;
 
-									var rowTemplate = monster.template(self, 'users-numbersItemRow', {
+									var rowTemplate = $(monster.template(self, 'users-numbersItemRow', {
 										isE911Enabled: monster.util.isNumberFeatureEnabled('e911'),
 										number: number
-									});
+									}));
 
 									monster.ui.tooltips(rowTemplate);