1 files changed, 12 insertions, 2 deletions
diff --git a/global-functions.rsc b/global-functions.rsc
index e5e5d50..85818b4 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -919,14 +919,24 @@
 # parse key value store
 :set ParseKeyValueStore do={
   :local Source $1;
+
+  :if ([ :pick $Source 0 1 ] = "{") do={
+    :do {
+      :return [ :deserialize from=json $Source ];
+    } on-error={ }
+  }
+
   :if ([ :typeof $Source ] != "array") do={
     :set Source [ :tostr $1 ];
   }
   :local Result ({});
   :foreach KeyValue in=[ :toarray $Source ] do={
     :if ([ :find $KeyValue "=" ]) do={
-      :set ($Result->[ :pick $KeyValue 0 [ :find $KeyValue "=" ] ]) \
-        [ :pick $KeyValue ([ :find $KeyValue "=" ] + 1) [ :len $KeyValue ] ];
+      :local Key [ :pick $KeyValue 0 [ :find $KeyValue "=" ] ];
+      :local Value [ :pick $KeyValue ([ :find $KeyValue "=" ] + 1) [ :len $KeyValue ] ];
+      :if ($Value="true") do={ :set Value true; }
+      :if ($Value="false") do={ :set Value false; }
+      :set ($Result->$Key) $Value;
     } else={
       :set ($Result->$KeyValue) true;
     }