diff --git a/resources/templates/provision/cisco/spa301/{$mac}.xml b/resources/templates/provision/cisco/spa301/{$mac}.xml
index d52eb1cf8e..9c26264aeb 100644
--- a/resources/templates/provision/cisco/spa301/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa301/{$mac}.xml
@@ -340,8 +340,7 @@
 <Station_Display_Name group="Phone/General">{$display_name_1}</Station_Display_Name>
 <Voice_Mail_Number group="Phone/General">*97</Voice_Mail_Number>
 
-{foreach $keys as $row}
-{if $row.device_key_category == "line"}
+{foreach $keys["line"] as $row}
 {if $row.device_key_type == "line"}
 <!-- Phone/Line_Key_{$row.device_key_id} -->
 <Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extension_{$row.device_key_id}_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
@@ -354,7 +353,6 @@
 <Share_Call_Appearance_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">private</Share_Call_Appearance_{$row.device_key_id}_> <!-- options: private/shared -->
 <Extended_Function_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extended_Function_{$row.device_key_id}_>
 {/if}
-{/if}
 
 {/foreach}
 
diff --git a/resources/templates/provision/cisco/spa303/{$mac}.xml b/resources/templates/provision/cisco/spa303/{$mac}.xml
index ff994cc6d8..7293141817 100644
--- a/resources/templates/provision/cisco/spa303/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa303/{$mac}.xml
@@ -1642,8 +1642,7 @@
 <Screen_Saver_Wait ua="rw">300</Screen_Saver_Wait>
 <Screen_Saver_Icon ua="rw">Background Picture</Screen_Saver_Icon> <!-- options: StationTime/Lock/Phone/DateTime/Background Picture -->
 
-{foreach $keys as $row}
-{if $row.device_key_category == "line"}
+{foreach $keys["line"] as $row}
 {if $row.device_key_type == "line"}
 <!-- Phone/Line_Key_{$row.device_key_id} -->
 <Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extension_{$row.device_key_id}_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
@@ -1656,7 +1655,6 @@
 <Share_Call_Appearance_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">private</Share_Call_Appearance_{$row.device_key_id}_> <!-- options: private/shared -->
 <Extended_Function_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extended_Function_{$row.device_key_id}_>
 {/if}
-{/if}
 
 {/foreach}
 
@@ -1940,16 +1938,14 @@
 <BLF_Held_LED ua="na"></BLF_Held_LED>
 
 <!-- Attendant_Console/Unit_x -->
-{foreach $keys as $row}
-{if $row.device_key_category == "expansion"}
+{foreach $keys["expansion"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-1"}
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-2"}
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
 <Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/if}
 {/foreach}
 
 <Protect_IVR_FactoryReset ua="na">No</Protect_IVR_FactoryReset>
diff --git a/resources/templates/provision/cisco/spa501g/{$mac}.xml b/resources/templates/provision/cisco/spa501g/{$mac}.xml
index 1a06c7a6a6..bd9b664329 100644
--- a/resources/templates/provision/cisco/spa501g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa501g/{$mac}.xml
@@ -345,8 +345,7 @@
 <Station_Display_Name group="Phone/General">{$display_name_1}</Station_Display_Name>
 <Voice_Mail_Number group="Phone/General">{$voicemail_number}</Voice_Mail_Number>
 
-{foreach $keys as $row}
-{if $row.device_key_category == "line"}
+{foreach $keys["line"] as $row}
 {if $row.device_key_type == "line"}
 <!-- Phone/Line_Key_{$row.device_key_id} -->
 <Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extension_{$row.device_key_id}_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
@@ -359,7 +358,6 @@
 <Share_Call_Appearance_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">private</Share_Call_Appearance_{$row.device_key_id}_> <!-- options: private/shared -->
 <Extended_Function_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extended_Function_{$row.device_key_id}_>
 {/if}
-{/if}
 
 {/foreach}
 
@@ -1484,16 +1482,14 @@
 <BLF_Held_LED group="Attendant_Console/Attendant_Key_LED_Pattern" />
 
 <!-- Attendant_Console/Unit_x -->
-{foreach $keys as $row}
-{if $row.device_key_category == "expansion"}
+{foreach $keys["expansion"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-1"}
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-2"}
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
 <Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/if}
 {/foreach}
 
 </flat-profile>
\ No newline at end of file
diff --git a/resources/templates/provision/cisco/spa502g/{$mac}.xml b/resources/templates/provision/cisco/spa502g/{$mac}.xml
index a445ff5185..0252028828 100644
--- a/resources/templates/provision/cisco/spa502g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa502g/{$mac}.xml
@@ -360,8 +360,7 @@
 <Screen_Saver_Wait group="Phone/General">300</Screen_Saver_Wait>
 <Screen_Saver_Icon group="Phone/General">Background Picture</Screen_Saver_Icon>
 
-{foreach $keys as $row}
-{if $row.device_key_category == "line"}
+{foreach $keys["line"] as $row}
 {if $row.device_key_type == "line"}
 <!-- Phone/Line_Key_{$row.device_key_id} -->
 <Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extension_{$row.device_key_id}_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
@@ -374,7 +373,6 @@
 <Share_Call_Appearance_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">private</Share_Call_Appearance_{$row.device_key_id}_> <!-- options: private/shared -->
 <Extended_Function_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extended_Function_{$row.device_key_id}_>
 {/if}
-{/if}
 
 {/foreach}
 
@@ -704,16 +702,14 @@
 <BLF_Held_LED group="Attendant_Console/Attendant_Key_LED_Pattern" />
 
 <!-- Attendant_Console/Unit_x -->
-{foreach $keys as $row}
-{if $row.device_key_category == "expansion"}
+{foreach $keys["expansion"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-1"}
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-2"}
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
 <Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/if}
 {/foreach}
 
 </flat-profile>
\ No newline at end of file
diff --git a/resources/templates/provision/cisco/spa504g/{$mac}.xml b/resources/templates/provision/cisco/spa504g/{$mac}.xml
index ebde6f347a..c61198a576 100644
--- a/resources/templates/provision/cisco/spa504g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa504g/{$mac}.xml
@@ -180,7 +180,7 @@
 <Screen_Saver_Wait group="Phone/General">300</Screen_Saver_Wait>
 <Screen_Saver_Icon group="Phone/General">Background Picture</Screen_Saver_Icon>
 
-{foreach $keys as $row}
+{foreach $keys["line"] as $row}
 {if $row.device_key_category == "line"}
 {if $row.device_key_type == "line"}
 <!-- Phone/Line_Key_{$row.device_key_id} -->
@@ -269,12 +269,10 @@
 <EM_Enable group="Phone/Extension_Mobility">No</EM_Enable>
 <EM_User_Domain group="Phone/Extension_Mobility" />
 <Line_Enable_1_ group="Ext_1/General">Yes</Line_Enable_1_>
-{foreach $keys as $row}
-{if $row.device_key_category == "line"}
+{foreach $keys["line"] as $row}
 {if $row.device_key_type == "line"}
 <Share_Ext_1_ group="Ext_1/Share_Line_Appearance">{if $row.device_key_extension == "shared"}shared{else}private{/if}</Share_Ext_1_>
 {/if}
-{/if}
 {/foreach}
 <Shared_User_ID_1_ group="Ext_1/Share_Line_Appearance" />
 <Subscription_Expires_1_ group="Ext_1/Share_Line_Appearance">3600</Subscription_Expires_1_>
@@ -648,16 +646,14 @@
 <Test_Mode_Enable group="Attendant_Console/General">No</Test_Mode_Enable>
 <Attendant_Console_Call_Pickup_Code group="Attendant_Console/General">**#</Attendant_Console_Call_Pickup_Code>
 
-{foreach $keys as $row}
-{if $row.device_key_category == "expansion"}
+{foreach $keys["expansion"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-1"}
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-2"}
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
 <Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/if}
 {/foreach}
 
 </flat-profile>
diff --git a/resources/templates/provision/cisco/spa508g/{$mac}.xml b/resources/templates/provision/cisco/spa508g/{$mac}.xml
index fac5cc1bab..bdd5c056b5 100644
--- a/resources/templates/provision/cisco/spa508g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa508g/{$mac}.xml
@@ -359,8 +359,7 @@
 <Screen_Saver_Wait group="Phone/General">300</Screen_Saver_Wait>
 <Screen_Saver_Icon group="Phone/General">Background Picture</Screen_Saver_Icon>
 
-{foreach $keys as $row}
-{if $row.device_key_category == "line"}
+{foreach $keys["line"] as $row}
 {if $row.device_key_type == "line"}
 <!-- Phone/Line_Key_{$row.device_key_id} -->
 <Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extension_{$row.device_key_id}_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
@@ -373,7 +372,6 @@
 <Share_Call_Appearance_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">private</Share_Call_Appearance_{$row.device_key_id}_> <!-- options: private/shared -->
 <Extended_Function_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extended_Function_{$row.device_key_id}_>
 {/if}
-{/if}
 
 {/foreach}
 
@@ -1581,16 +1579,14 @@
 <BLF_Held_LED group="Attendant_Console/Attendant_Key_LED_Pattern" />
 
 <!-- Attendant_Console/Unit_x -->
-{foreach $keys as $row}
-{if $row.device_key_category == "expansion"}
+{foreach $keys["expansion"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-1"}
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-2"}
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
 <Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/if}
 {/foreach}
 
 </flat-profile>
\ No newline at end of file
diff --git a/resources/templates/provision/cisco/spa509g/{$mac}.xml b/resources/templates/provision/cisco/spa509g/{$mac}.xml
index 79ae67a7b1..84c76986ca 100644
--- a/resources/templates/provision/cisco/spa509g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa509g/{$mac}.xml
@@ -361,8 +361,7 @@
 <Screen_Saver_Wait group="Phone/General">300</Screen_Saver_Wait>
 <Screen_Saver_Icon group="Phone/General">Background Picture</Screen_Saver_Icon>
 
-{foreach $keys as $row}
-{if $row.device_key_category == "line"}
+{foreach $keys["line"] as $row}
 {if $row.device_key_type == "line"}
 <!-- Phone/Line_Key_{$row.device_key_id} -->
 <Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extension_{$row.device_key_id}_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
@@ -375,7 +374,6 @@
 <Share_Call_Appearance_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">private</Share_Call_Appearance_{$row.device_key_id}_> <!-- options: private/shared -->
 <Extended_Function_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extended_Function_{$row.device_key_id}_>
 {/if}
-{/if}
 
 {/foreach}
 
@@ -2074,16 +2072,14 @@
 <BLF_Held_LED group="Attendant_Console/Attendant_Key_LED_Pattern" />
 
 <!-- Attendant_Console/Unit_x -->
-{foreach $keys as $row}
-{if $row.device_key_category == "expansion"}
+{foreach $keys["expansion"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-1"}
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-2"}
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
 <Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/if}
 {/foreach}
 
 </flat-profile>
diff --git a/resources/templates/provision/cisco/spa512g/{$mac}.xml b/resources/templates/provision/cisco/spa512g/{$mac}.xml
index 4f0871fccf..9c167259aa 100644
--- a/resources/templates/provision/cisco/spa512g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa512g/{$mac}.xml
@@ -361,8 +361,7 @@
 <Screen_Saver_Wait group="Phone/General">300</Screen_Saver_Wait>
 <Screen_Saver_Icon group="Phone/General">Background Picture</Screen_Saver_Icon>
 
-{foreach $keys as $row}
-{if $row.device_key_category == "line"}
+{foreach $keys["line"] as $row}
 {if $row.device_key_type == "line"}
 <!-- Phone/Line_Key_{$row.device_key_id} -->
 <Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extension_{$row.device_key_id}_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
@@ -375,7 +374,6 @@
 <Share_Call_Appearance_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">private</Share_Call_Appearance_{$row.device_key_id}_> <!-- options: private/shared -->
 <Extended_Function_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extended_Function_{$row.device_key_id}_>
 {/if}
-{/if}
 
 {/foreach}
 
@@ -700,16 +698,14 @@
 <BLF_Held_LED group="Attendant_Console/Attendant_Key_LED_Pattern" />
 
 <!-- Attendant_Console/Unit_x -->
-{foreach $keys as $row}
-{if $row.device_key_category == "expansion"}
+{foreach $keys["expansion"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-1"}
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-2"}
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
 <Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/if}
 {/foreach}
 
 <!-- TR-069/TR-069 -->
diff --git a/resources/templates/provision/cisco/spa514g/{$mac}.xml b/resources/templates/provision/cisco/spa514g/{$mac}.xml
index ab4ef404b7..44988e6f5a 100644
--- a/resources/templates/provision/cisco/spa514g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa514g/{$mac}.xml
@@ -164,8 +164,7 @@
 <Screen_Saver_Wait group="Phone/General">300</Screen_Saver_Wait>
 <Screen_Saver_Icon group="Phone/General">Background Picture</Screen_Saver_Icon>
 
-{foreach $keys as $row}
-{if $row.device_key_category == "line"}
+{foreach $keys["line"] as $row}
 {if $row.device_key_type == "line"}
 <!-- Phone/Line_Key_{$row.device_key_id} -->
 <Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extension_{$row.device_key_id}_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
@@ -178,7 +177,6 @@
 <Share_Call_Appearance_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">private</Share_Call_Appearance_{$row.device_key_id}_> <!-- options: private/shared -->
 <Extended_Function_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extended_Function_{$row.device_key_id}_>
 {/if}
-{/if}
 
 {/foreach}
 
@@ -780,16 +778,14 @@
 <BLF_Held_LED group="Attendant_Console/Attendant_Key_LED_Pattern" />
 
 <!-- Attendant_Console/Unit_x -->
-{foreach $keys as $row}
-{if $row.device_key_category == "expansion"}
+{foreach $keys["expansion"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-1"}
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-2"}
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
 <Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/if}
 {/foreach}
 
 <!-- TR-069/TR-069 -->
diff --git a/resources/templates/provision/cisco/spa525g/{$mac}.xml b/resources/templates/provision/cisco/spa525g/{$mac}.xml
index 03319015ea..094e6cff22 100644
--- a/resources/templates/provision/cisco/spa525g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa525g/{$mac}.xml
@@ -1642,8 +1642,7 @@
 <Screen_Saver_Wait ua="rw">300</Screen_Saver_Wait>
 <Screen_Saver_Icon ua="rw">Background Picture</Screen_Saver_Icon> <!-- options: StationTime/Lock/Phone/DateTime/Background Picture -->
 
-{foreach $keys as $row}
-{if $row.device_key_category == "line"}
+{foreach $keys["line"] as $row}
 {if $row.device_key_type == "line"}
 <!-- Phone/Line_Key_{$row.device_key_id} -->
 <Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extension_{$row.device_key_id}_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
@@ -1656,7 +1655,6 @@
 <Share_Call_Appearance_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">private</Share_Call_Appearance_{$row.device_key_id}_> <!-- options: private/shared -->
 <Extended_Function_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extended_Function_{$row.device_key_id}_>
 {/if}
-{/if}
 
 {/foreach}
 
@@ -1939,18 +1937,15 @@
 <BLF_Busy_LED ua="na"></BLF_Busy_LED>
 <BLF_Held_LED ua="na"></BLF_Held_LED>
 
-
 <!-- Attendant_Console/Unit_x -->
-{foreach $keys as $row}
-{if $row.device_key_category == "expansion"}
+{foreach $keys["expansion"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-1"}
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
 <Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/if}
-{if $row.device_key_category == "expansion-2"}
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
 <Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/if}
 {/foreach}
 
 <Protect_IVR_FactoryReset ua="na">No</Protect_IVR_FactoryReset>
diff --git a/resources/templates/provision/linksys/spa3102/{$mac}.xml b/resources/templates/provision/linksys/spa3102/{$mac}.xml
index 49120b0358..246a3fd029 100644
--- a/resources/templates/provision/linksys/spa3102/{$mac}.xml
+++ b/resources/templates/provision/linksys/spa3102/{$mac}.xml
@@ -33,7 +33,6 @@
   <Resync_On_Reset>yes</Resync_On_Reset>
   <Resync_Error_Retry_Delay>10</Resync_Error_Retry_Delay>
 
-
   <!-- network config -->
   <DHCP>yes</DHCP> <!-- for WAN port -->
   <!--
@@ -47,7 +46,6 @@
   <Debug_Level>2</Debug_Level>
   -->
 
-
   <!-- WAN web interface -->
   <!-- WARNING: Passwords are set empty below.  Take appropriate security measures when enabling web interface on WAN.
   <Enable_WAN_Web_Server>yes</Enable_WAN_Web_Server>
@@ -67,7 +65,6 @@
   -->
   <Time_Zone>GMT-{$time_zone_offset}</Time_Zone>
 
-
   <!-- SIP settings -->
   <Proxy_1_>{$server_address_1}</Proxy_1_>
   <SIP_Port_1_>{$sip_port_1}</SIP_Port_1_>
@@ -80,7 +77,6 @@
   <SIP_Debug_Option_1_>full</SIP_Debug_Option_1_>
   -->
 
-
   <!-- FXS port aka "Line 1" in web interface -->
   <Register_1_>yes</Register_1_>
   <User_ID_1_>{$user_id_1}</User_ID_1_>
@@ -92,4 +88,4 @@
 
   <!-- IVR -->
   <Protect_IVR_FactoryReset>no</Protect_IVR_FactoryReset>
-</flat-profile>
+</flat-profile>
\ No newline at end of file
diff --git a/resources/templates/provision/linksys/spa941/{$mac}.xml b/resources/templates/provision/linksys/spa941/{$mac}.xml
index fe6cb4914f..3dd9ae7db9 100644
--- a/resources/templates/provision/linksys/spa941/{$mac}.xml
+++ b/resources/templates/provision/linksys/spa941/{$mac}.xml
@@ -276,8 +276,7 @@
 <Screen_Saver_Wait group="Phone/General">300</Screen_Saver_Wait>
 <Screen_Saver_Icon group="Phone/General">Background Picture</Screen_Saver_Icon>
 
-{foreach $keys as $row}
-{if $row.device_key_category == "line"}
+{foreach $keys["line"] as $row}
 {if $row.device_key_type == "line"}
 <!-- Phone/Line_Key_{$row.device_key_id} -->
 <Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extension_{$row.device_key_id}_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
@@ -290,7 +289,6 @@
 <Share_Call_Appearance_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">private</Share_Call_Appearance_{$row.device_key_id}_> <!-- options: private/shared -->
 <Extended_Function_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extended_Function_{$row.device_key_id}_>
 {/if}
-{/if}
 
 {/foreach}
 
diff --git a/resources/templates/provision/linksys/spa942/{$mac}.xml b/resources/templates/provision/linksys/spa942/{$mac}.xml
index 73e46bdc6c..2bbed0be7d 100644
--- a/resources/templates/provision/linksys/spa942/{$mac}.xml
+++ b/resources/templates/provision/linksys/spa942/{$mac}.xml
@@ -276,8 +276,7 @@
 <Screen_Saver_Wait group="Phone/General">300</Screen_Saver_Wait>
 <Screen_Saver_Icon group="Phone/General">Background Picture</Screen_Saver_Icon>
 
-{foreach $keys as $row}
-{if $row.device_key_category == "line"}
+{foreach $keys["line"] as $row}
 {if $row.device_key_type == "line"}
 <!-- Phone/Line_Key_{$row.device_key_id} -->
 <Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extension_{$row.device_key_id}_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
@@ -290,7 +289,6 @@
 <Share_Call_Appearance_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">private</Share_Call_Appearance_{$row.device_key_id}_> <!-- options: private/shared -->
 <Extended_Function_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extended_Function_{$row.device_key_id}_>
 {/if}
-{/if}
 
 {/foreach}