diff --git a/resources/templates/provision/escene/e3xx/{$mac}_extern.xml b/resources/templates/provision/escene/e3xx/{$mac}_extern.xml
index c90cdab531..9850665218 100644
--- a/resources/templates/provision/escene/e3xx/{$mac}_extern.xml
+++ b/resources/templates/provision/escene/e3xx/{$mac}_extern.xml
@@ -1,16 +1,15 @@
 <all>
-{foreach $keys as $row}
+{foreach $keys['memory'] as $row}
 	{if $row.device_key_line==""}
 		{$row.device_key_line="127"}
 	{/if}
 {/foreach}
+
 	<hotlines>
 	{$is_first_line='true'}
-	{foreach $keys as $row}
-		{if $row.device_key_category=="memory"}
-			{if $row.device_key_id!=""}
-				<hotline {if $is_first_line=='true'}ExternID="0"{$is_first_line='false'}{/if} id="{$row.device_key_id-1}" SipAccounts="{$row.device_key_line}" ID="{$row.device_key_id-1}" Type="{$row.device_key_type}" HotlineNum="{$row.device_key_value}" Name="{$row.device_key_label}"/>
-			{/if}
+	{foreach $keys['memory'] as $row}
+		{if $row.device_key_id != ""}
+			<hotline {if $is_first_line=='true'}ExternID="0"{$is_first_line='false'}{/if} id="{$row.device_key_id-1}" SipAccounts="{$row.device_key_line}" ID="{$row.device_key_id-1}" Type="{$row.device_key_type}" HotlineNum="{$row.device_key_value}" Name="{$row.device_key_label}"/>
 		{/if}
 	{/foreach}
 	</hotlines>
@@ -56,70 +55,56 @@
 		19 - Auto Provison Now
 		20 - Hot Desking
 	-->
-	{foreach $keys as $row}
-		{if $row.device_key_category=="programmable"}
-			<ProgramKey id="{$row.device_key_id-1}" SipAccounts="{$row.device_key_line}" Type="{$row.device_key_type}" Num="{$row.device_key_value}" Name="{$row.device_key_label}"/>
-		{/if}
+	{foreach $keys['programmable'] as $row}
+		<ProgramKey id="{$row.device_key_id-1}" SipAccounts="{$row.device_key_line}" Type="{$row.device_key_type}" Num="{$row.device_key_value}" Name="{$row.device_key_label}"/>
 	{/foreach}
 	</ProgramKeys>
 
 	<Extensions>
-	{foreach $keys as $row}
-		{if $row.device_key_category=="expansion"}
-			{if $row.device_key_id le "32"}
-				<extension id="{$row.device_key_id-1}"  HotlineNum="{$row.device_key_value}" SipAccounts="{$row.device_key_line}" ID="{$row.device_key_id-1}" Type="{$row.device_key_type}" Name="{$row.device_key_label}" />
-			{/if}
+	{foreach $keys['expansion'] as $row}
+		{if $row.device_key_id le "32"}
+			<extension id="{$row.device_key_id-1}"  HotlineNum="{$row.device_key_value}" SipAccounts="{$row.device_key_line}" ID="{$row.device_key_id-1}" Type="{$row.device_key_type}" Name="{$row.device_key_label}" />
 		{/if}
 	{/foreach}
 	</Extensions>
 
 	<Extension2s>
-	{foreach $keys as $row}
-		{if $row.device_key_category=="expansion"}
-			{if ($row.device_key_id gt "32")&&($row.device_key_id le "64")}
-				<extension2 id="{$row.device_key_id-33}"  HotlineNum="{$row.device_key_value}" SipAccounts="{$row.device_key_line}" ID="{$row.device_key_id-33}" Type="{$row.device_key_type}" Name="{$row.device_key_label}" />
-			{/if}
+	{foreach $keys['expansion'] as $row}
+		{if ($row.device_key_id gt "32")&&($row.device_key_id le "64")}
+			<extension2 id="{$row.device_key_id-33}"  HotlineNum="{$row.device_key_value}" SipAccounts="{$row.device_key_line}" ID="{$row.device_key_id-33}" Type="{$row.device_key_type}" Name="{$row.device_key_label}" />
 		{/if}
 	{/foreach}
 	</Extension2s>
 
 	<Extension3s>
-	{foreach $keys as $row}
-		{if $row.device_key_category=="expansion"}
-			{if ($row.device_key_id gt "64")&&($row.device_key_id le "96")}
-				<extension3 id="{$row.device_key_id-65}"  HotlineNum="{$row.device_key_value}" SipAccounts="{$row.device_key_line}" ID="{$row.device_key_id-65}" Type="{$row.device_key_type}" Name="{$row.device_key_label}" />
-			{/if}
+	{foreach $keys['expansion'] as $row}
+		{if ($row.device_key_id gt "64")&&($row.device_key_id le "96")}
+			<extension3 id="{$row.device_key_id-65}"  HotlineNum="{$row.device_key_value}" SipAccounts="{$row.device_key_line}" ID="{$row.device_key_id-65}" Type="{$row.device_key_type}" Name="{$row.device_key_label}" />
 		{/if}
 	{/foreach}
 	</Extension3s>
 
 	<Extension4s>
-	{foreach $keys as $row}
-		{if $row.device_key_category=="expansion"}
-			{if ($row.device_key_id gt "96")&&($row.device_key_id le "128")}
-				<extension4 id="{$row.device_key_id-97}"  HotlineNum="{$row.device_key_value}" SipAccounts="{$row.device_key_line}" ID="{$row.device_key_id-97}" Type="{$row.device_key_type}" Name="{$row.device_key_label}" />
-			{/if}
+	{foreach $keys['expansion'] as $row}
+		{if ($row.device_key_id gt "96")&&($row.device_key_id le "128")}
+			<extension4 id="{$row.device_key_id-97}"  HotlineNum="{$row.device_key_value}" SipAccounts="{$row.device_key_line}" ID="{$row.device_key_id-97}" Type="{$row.device_key_type}" Name="{$row.device_key_label}" />
 		{/if}
 	{/foreach}
 	</Extension4s>
 
 	<Extension5s>
-	{foreach $keys as $row}
-		{if $row.device_key_category=="expansion"}
-			{if ($row.device_key_id gt "128")&&($row.device_key_id le "160")}
-				<extension5 id="{$row.device_key_id-129}"  HotlineNum="{$row.device_key_value}" SipAccounts="{$row.device_key_line}" ID="{$row.device_key_id-129}" Type="{$row.device_key_type}" Name="{$row.device_key_label}" />
-			{/if}
+	{foreach $keys['expansion'] as $row}
+		{if ($row.device_key_id gt "128")&&($row.device_key_id le "160")}
+			<extension5 id="{$row.device_key_id-129}"  HotlineNum="{$row.device_key_value}" SipAccounts="{$row.device_key_line}" ID="{$row.device_key_id-129}" Type="{$row.device_key_type}" Name="{$row.device_key_label}" />
 		{/if}
 	{/foreach}
 	</Extension5s>
 
 	<Extension6s>
-	{foreach $keys as $row}
-		{if $row.device_key_category=="expansion"}
-			{if ($row.device_key_id gt "160")&&($row.device_key_id le "192")}
-				<extension6 id="{$row.device_key_id-161}"  HotlineNum="{$row.device_key_value}" SipAccounts="{$row.device_key_line}" ID="{$row.device_key_id-161}" Type="{$row.device_key_type}" Name="{$row.device_key_label}" />
-			{/if}
+	{foreach $keys['expansion'] as $row}
+		{if ($row.device_key_id gt "160")&&($row.device_key_id le "192")}
+			<extension6 id="{$row.device_key_id-161}"  HotlineNum="{$row.device_key_value}" SipAccounts="{$row.device_key_line}" ID="{$row.device_key_id-161}" Type="{$row.device_key_type}" Name="{$row.device_key_label}" />
 		{/if}
 	{/foreach}
 	</Extension6s>
-</all>
+</all>
\ No newline at end of file
diff --git a/resources/templates/provision/snom/320/{$mac}.xml b/resources/templates/provision/snom/320/{$mac}.xml
index 0dececa221..9de745c4f5 100644
--- a/resources/templates/provision/snom/320/{$mac}.xml
+++ b/resources/templates/provision/snom/320/{$mac}.xml
@@ -105,19 +105,18 @@
 <codec_priority_list idx="12" perm="">g722,pcmu,pcma,gsm,g726-32,aal2-g726-32,g723,g729,telephone-event</codec_priority_list>
 </phone-settings>
 <functionKeys e="2">
-{foreach $keys as $row}
+{foreach $keys['line'] as $row}
 {if $row.device_key_line == ""}
-    {if $row.device_key_category == "line"}
     <fkey idx="{$row.device_key_id-1}" context="active" label="{$row.device_key_label}" perm="">{$row.device_key_type} {$row.device_key_value} {$row.device_key_extension}</fkey>
-    {else}
-    <fkey idx="{$row.device_key_id}" context="active" label="" perm="">line</fkey>
-    {/if}
 {else}
-    {if $row.device_key_category == "line"}
     <fkey idx="{$row.device_key_id-1}" context="{$row.device_key_line}" label="{$row.device_key_label}" perm="">{$row.device_key_type} {$row.device_key_value} {$row.device_key_extension}</fkey>
-    {else}
+{/if}
+{/foreach}
+{foreach $keys['expansion'] as $row}
+{if $row.device_key_line == ""}
+    <fkey idx="{$row.device_key_id-1}" context="active" label="{$row.device_key_label}" perm="">{$row.device_key_type} {$row.device_key_value} {$row.device_key_extension}</fkey>
+{else}
     <fkey idx="{$row.device_key_id}" context="active" label="" perm="">line</fkey>
-    {/if}
 {/if}
 {/foreach}
 </functionKeys>
@@ -131,4 +130,4 @@
 {/foreach}
 
 </tbook>
-</settings>
+</settings>
\ No newline at end of file