diff --git a/source/Ox.UI/js/Calendar/ListCalendar.js b/source/Ox.UI/js/Calendar/ListCalendar.js
index 0148b3c0..8e55b0cd 100644
--- a/source/Ox.UI/js/Calendar/ListCalendar.js
+++ b/source/Ox.UI/js/Calendar/ListCalendar.js
@@ -616,9 +616,10 @@ Ox.ListCalendar = function(options, self) {
 
     function decodeValues(place) {
         return Ox.map(place, function(value) {
-            return Ox.isString(value) ? Ox.decodeHTMLEntities(value)
-                : Ox.isArray(value) ? Ox.map(value, function(value) {
-                    return Ox.decodeHTMLEntities(value);
+            var type = Ox.typeOf(value);
+            return type == 'string' ? Ox.decodeHTMLEntities(value)
+                : type == 'array' ? Ox.map(value, function(value) {
+                    return decodeValues(value);
                 })
                 : value;
         });
@@ -642,9 +643,10 @@ Ox.ListCalendar = function(options, self) {
 
     function encodeValues(place) {
         return Ox.map(place, function(value) {
-            return Ox.isString(value) ? Ox.encodeHTMLEntities(value)
-                : Ox.isArray(value) ? Ox.map(value, function(value) {
-                    return Ox.encodeHTMLEntities(value);
+            var type = Ox.typeOf(value);
+            return type == 'string' ? Ox.encodeHTMLEntities(value)
+                : type == 'array' ? Ox.map(value, function(value) {
+                    return encodeValues(value);
                 })
                 : value;
         });
diff --git a/source/Ox.UI/js/Map/ListMap.js b/source/Ox.UI/js/Map/ListMap.js
index daf4afe0..4c1935c1 100644
--- a/source/Ox.UI/js/Map/ListMap.js
+++ b/source/Ox.UI/js/Map/ListMap.js
@@ -554,7 +554,6 @@ Ox.ListMap = function(options, self) {
         .hide()
         .bindEvent({
             change: function(data) {
-                Ox.print('CHANGE', data)
                 var isResult = self.selectedPlace[0] == '_';
                 if (data.id == 'name') {
                     !isResult && self.$list.value(self.selectedPlace, 'name', data.data.value);
@@ -846,9 +845,10 @@ Ox.ListMap = function(options, self) {
 
     function decodeValues(place) {
         return Ox.map(place, function(value) {
-            return Ox.isString(value) ? Ox.decodeHTMLEntities(value)
-                : Ox.isArray(value) ? Ox.map(value, function(value) {
-                    return Ox.decodeHTMLEntities(value);
+            var type = Ox.typeOf(value);
+            return type == 'string' ? Ox.decodeHTMLEntities(value)
+                : type == 'array' ? Ox.map(value, function(value) {
+                    return decodeValues(value);
                 })
                 : value;
         });
@@ -861,9 +861,10 @@ Ox.ListMap = function(options, self) {
 
     function encodeValues(place) {
         return Ox.map(place, function(value) {
-            return Ox.isString(value) ? Ox.encodeHTMLEntities(value)
-                : Ox.isArray(value) ? Ox.map(value, function(value) {
-                    return Ox.encodeHTMLEntities(value);
+            var type = Ox.typeOf(value);
+            return type == 'string' ? Ox.encodeHTMLEntities(value)
+                : type == 'array' ? Ox.map(value, function(value) {
+                    return encodeValues(value);
                 })
                 : value;
         });