diff --git a/views/devices-sip_device.html b/views/devices-sip_device.html
index a3ab1ab..a4d9fa6 100644
--- a/views/devices-sip_device.html
+++ b/views/devices-sip_device.html
@@ -284,7 +284,7 @@
 					<div class="controls">
 						<select name="provision.feature_keys[{{@key}}].type" class="feature-key-type span2">
 						{{#select type}}
-							{{#each ../../extra.featureKeys.types}}
+							{{#each ../extra.featureKeys.types}}
 								<option value="{{id}}">{{text}}</option>
 							{{/each}}
 						{{/select}}
@@ -292,7 +292,7 @@
 						<div class="feature-key-value" data-type="presence">
 							<label for="provision.feature_keys[{{@key}}].value">{{ @root.i18n.devices.popupSettings.featureKeys.labels.user }}</label>
 							<select name="provision.feature_keys[{{@key}}].value" class="chosen-feature-key-user">
-							{{#each ../../extra.users}}
+							{{#each ../extra.users}}
 								<option value="{{id}}">{{first_name}} {{last_name}}</option>
 							{{/each}}
 							</select>
@@ -300,7 +300,7 @@
 						<div class="feature-key-value" data-type="parking">
 							<label for="provision.feature_keys[{{@key}}].value">{{ @root.i18n.devices.popupSettings.featureKeys.labels.parkingSpot }}</label>
 							<select class="span1" name="provision.feature_keys[{{@key}}].value">
-							{{#each ../../extra.featureKeys.parkingSpots}}
+							{{#each ../extra.featureKeys.parkingSpots}}
 								<option value="{{this}}">{{this}}</option>
 							{{/each}}
 							</select>
@@ -308,7 +308,7 @@
 						<div class="feature-key-value" data-type="personal_parking">
 							<label for="provision.feature_keys[{{@key}}].value">{{ @root.i18n.devices.popupSettings.featureKeys.labels.user }}</label>
 							<select name="provision.feature_keys[{{@key}}].value" class="chosen-feature-key-user">
-							{{#each ../../extra.users}}
+							{{#each ../extra.users}}
 								<option value="{{id}}">{{first_name}} {{last_name}}</option>
 							{{/each}}
 							</select>
diff --git a/views/groups-numbers.html b/views/groups-numbers.html
index 724cccf..345dfd0 100644
--- a/views/groups-numbers.html
+++ b/views/groups-numbers.html
@@ -14,10 +14,10 @@
 										<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
 										<ul class="dropdown-menu">
 										{{#unless isLocal}}
-											{{#if ../../isCnamEnabled}}
+											{{#if ../isCnamEnabled}}
 												<li><a class="callerId-number" href="#"><i class="fa fa-user"></i>{{ @root.i18n.callerId }}</a></li>
 											{{/if}}
-											{{#if ../../isE911Enabled}}
+											{{#if ../isE911Enabled}}
 												<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ @root.i18n.e911 }}</a></li>
 											{{/if}}
 										{{/unless}}
diff --git a/views/strategy-callsTab.html b/views/strategy-callsTab.html
index 66d2859..da509cd 100644
--- a/views/strategy-callsTab.html
+++ b/views/strategy-callsTab.html
@@ -97,7 +97,7 @@
 			{{#each callEntities}}
 				{{#compare groupType '===' 'advancedCallflows'}}
 					{{#each entities}}
-						<option value="{{id}}" data-type="{{module}}"{{#compare ../../../callOption.callEntityId '===' id}} selected{{/compare}}>{{name}}</option>
+						<option value="{{id}}" data-type="{{module}}"{{#compare ../../callOption.callEntityId '===' id}} selected{{/compare}}>{{name}}</option>
 					{{/each}}
 				{{/compare}}
 			{{/each}}
diff --git a/views/strategy-numbers.html b/views/strategy-numbers.html
index 1226f6a..ea9b417 100644
--- a/views/strategy-numbers.html
+++ b/views/strategy-numbers.html
@@ -14,10 +14,10 @@
 						<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
 						<ul class="dropdown-menu">
 						{{#unless isLocal}}
-							{{#if ../../isCnamEnabled}}
+							{{#if ../isCnamEnabled}}
 								<li><a class="callerId-number" href="#"><i class="fa fa-user"></i>{{ @root.i18n.callerId }}</a></li>
 							{{/if}}
-							{{#if ../../isE911Enabled}}
+							{{#if ../isE911Enabled}}
 								<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ @root.i18n.e911 }}</a></li>
 							{{/if}}
 						{{/unless}}
diff --git a/views/users-feature-caller_id.html b/views/users-feature-caller_id.html
index 875cf76..b585576 100644
--- a/views/users-feature-caller_id.html
+++ b/views/users-feature-caller_id.html
@@ -10,12 +10,11 @@
 		{{/monsterSwitch}}
 		</div>
 	</div>
-
 	<div class="content{{#unless extra.mapFeatures.caller_id.active}} disabled{{/unless}}">
 		{{ i18n.users.caller_id.dropdownLabel }}
 		<select class="caller-id-select">
 			{{#each extra.listCallerId}}
-				<option{{#compare ../this.caller_id.internal.number "===" this}} selected{{/compare}} value="{{this}}">{{this}}</option>
+				<option{{#compare ../this.caller_id.external.number "===" this}} selected{{/compare}} value="{{this}}">{{this}}</option>
 			{{/each}}
 		</select>
 
diff --git a/views/users-numbers.html b/views/users-numbers.html
index f1def99..ab9d118 100644
--- a/views/users-numbers.html
+++ b/views/users-numbers.html
@@ -15,10 +15,10 @@
 										<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
 										<ul class="dropdown-menu">
 										{{#unless this.isLocal}}
-											{{#if ../../../isCnamEnabled}}
+											{{#if ../isCnamEnabled}}
 												<li><a class="callerId-number" href="#"><i class="fa fa-user"></i>{{ @root.i18n.callerId }}</a></li>
 											{{/if}}
-											{{#if ../../../isE911Enabled}}
+											{{#if ../isE911Enabled}}
 												<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ @root.i18n.e911 }}</a></li>
 											{{/if}}
 										{{/unless}}