diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg
index 02a4496805..30e21d6ebb 100644
--- a/resources/templates/provision/yealink/t32g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg
@@ -237,7 +237,7 @@ account.1.advanced.timer_t1 =
 account.1.advanced.timer_t2 =
 account.1.advanced.timer_t4 =
 
-#Assign a ringtone for account 1. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - ­Ring8.wav.
+#Assign a ringtone for account 1. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - �Ring8.wav.
 #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav
 #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav
 account.1.ringtone.ring_type =
@@ -863,7 +863,7 @@ account.3.advanced.timer_t1 =
 account.3.advanced.timer_t2 =
 account.3.advanced.timer_t4 =
 
-#Assign a ringtone for account 3. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - ­Ring8.wav.
+#Assign a ringtone for account 3. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - �Ring8.wav.
 #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav
 #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav
 account.3.ringtone.ring_type =
@@ -1801,7 +1801,7 @@ account.6.advanced.timer_t1 =
 account.6.advanced.timer_t2 =
 account.6.advanced.timer_t4 =
 
-#Assign a ringtone for account 6. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - ­Ring8.wav.
+#Assign a ringtone for account 6. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - �Ring8.wav.
 #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav
 #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav
 account.6.ringtone.ring_type =
@@ -1919,8 +1919,8 @@ forward.international.enable =
 #The default value equals to the value of x. For example, the default value of the parameter "linekey.1.line" is 1.
 #linekey.x.lable--Define the label for each line key.
 
-{foreach $keys as $row}
-{if $row.device_key_category == "line"}
+{foreach $keys['line'] as $row}
+
 #Configure Line Key {$row.device_key_id}
 linekey.{$row.device_key_id}.line = {$row.device_key_line}
 linekey.{$row.device_key_id}.value = {$row.device_key_value}
@@ -1931,7 +1931,7 @@ linekey.{$row.device_key_id}.type = {$row.device_key_type}
 #linekey.{$row.device_key_id}.xml_phonebook =
 linekey.{$row.device_key_id}.label = {$row.device_key_label}
 
-{/if}
+
 {/foreach}
 
 
@@ -1952,8 +1952,8 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label}
 #memorykey.x.xml_phonebook--Specify the desired remote phonebook/local group/BSFT phonebook for the DSS key. This parameter is only appilicable to the feature XML Group/Local Group/Broadsoft Group.
 #memorykey.x.sub_type =
 
-{foreach $keys as $row}
-{if $row.device_key_category == "memory"}
+{foreach $keys["memory"] as $row}
+
 #Expansion Memory Key {$row.device_key_id}
 memorykey.{$row.device_key_id}.type = {$row.device_key_type}
 memorykey.{$row.device_key_id}.line = {$row.device_key_line}
@@ -1965,7 +1965,7 @@ memorykey.{$row.device_key_id}.label = {$row.device_key_label}
 #memorykey.{$row.device_key_id}.xml_phonebook =
 #memorykey.{$row.device_key_id}.sub_type =
 
-{/if}
+
 {/foreach}
 
 
@@ -1988,12 +1988,15 @@ memorykey.{$row.device_key_id}.label = {$row.device_key_label}
 
 #programablekey.x.label--This parameter is only available to the key 1 to key 4.
 
-programablekey.1.type =
-programablekey.1.line =
-programablekey.1.value =
-programablekey.1.xml_phonebook =
-programablekey.1.history_type =
-programablekey.1.label =
+foreach $keys["programmable"] as $row}
+programablekey.{$row.device_key_id}.type = {$row.device_key_type}
+programablekey.{$row.device_key_id}.line = {$row.device_key_line}
+programablekey.{$row.device_key_id}.value = {$row.device_key_value}
+programablekey.{$row.device_key_id}.xml_phonebook =
+programablekey.{$row.device_key_id}.history_type =
+programablekey.{$row.device_key_id}.label = {$row.device_key_label}
+
+ {/foreach}
 
 
 ##########################################################################################
@@ -2007,8 +2010,8 @@ programablekey.1.label =
 #expansion_module.x.key.y.label =
 #expansion_module.X.key.Y.xml_phonebook =
 
-{foreach $keys as $row}
-{if $row.device_key_category == "expansion"}
+{foreach $keys["expansion"] as $row}
+
 #Expansion module 1 key {$row.device_key_id}
 expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
 expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
@@ -2019,7 +2022,7 @@ expansion_module.1.key.{$row.device_key_id}.pickup_value = {$row.device_key_exte
 expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
 expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
 
-{/if}
+
 {/foreach}
 
 ##########################################################################################