diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index bd12da6..233709a 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -265,9 +265,9 @@ define(function(require) {
 											data: _.map(dataDevice.provision[key], function(dataItem) {
 												var value = _.get(dataItem, 'value', {});
 
-												if (_.isString(value)) {
+												if (!_.isPlainObject(value)) {
 													dataItem.value = {
-														value: value
+														value: _.toString(value)
 													};
 												}
 
@@ -861,7 +861,7 @@ define(function(require) {
 						if (val.type === 'none') {
 							keys[idx] = null;
 						} else {
-							if (val.type === 'parking') {
+							if (key === 'combo_keys' && val.type === 'parking') {
 								val.value.value = _.parseInt(val.value.value, 10);
 							}