diff --git a/solar/solar/cli/main.py b/solar/solar/cli/main.py
index 85d0c07b..5be1529d 100644
--- a/solar/solar/cli/main.py
+++ b/solar/solar/cli/main.py
@@ -313,9 +313,8 @@ def init_cli_resource():
                 k, v = arg.split('=')
                 args_parsed.update({k: v})
         click.echo('Updating resource {} with args {}'.format(name, args_parsed))
-        all = sresource.load_all()
-        r = all[name]
-        r.update(args_parsed)
+        res = sresource.load(name)
+        res.update(args_parsed)
 
     @resource.command()
     @click.option('--check-missing-connections', default=False, is_flag=True)
diff --git a/solar/solar/system_log/data.py b/solar/solar/system_log/data.py
index 5f8f49ad..02f7addb 100644
--- a/solar/solar/system_log/data.py
+++ b/solar/solar/system_log/data.py
@@ -152,11 +152,13 @@ class Data(collections.MutableMapping):
 
     def __init__(self, path):
         self.path = path
-        self.store = {}
         r = db.get(path, collection=db.COLLECTIONS.state_data,
                    return_empty=True, db_convert=False)
+
         if r:
-            self.store = r or self.store
+            self.store = r.get('properties', {})
+        else:
+            self.store = {}
 
     def __getitem__(self, key):
         return self.store[key]