diff --git a/firebase-element.html b/firebase-element.html
index 02a0f6c..1c26dd7 100644
--- a/firebase-element.html
+++ b/firebase-element.html
@@ -234,18 +234,20 @@ <h3>My Firebase Data</h3>
         if (this.limit > 0) {
           query = query.limit(this.limit);
         }
-        this.query = query;
       }
+      this.query = query;
     },
     queryChanged: function() {
       // initialize
       this._setData(null);
       // data acquisition
       this.dataReady = false;
-      this.valueLoading = true;
-      this.query.once('value', this.valueLoaded, this);
-      // observe server-side data
-      this.observeQuery();
+      if (this.query) {
+        this.valueLoading = true;
+        this.query.once('value', this.valueLoaded, this);
+        // observe server-side data
+        this.observeQuery();
+      }
     },
     valueLoaded: function(snapshot) {
       this.valueLoading = false;
@@ -380,12 +382,8 @@ <h3>My Firebase Data</h3>
       }
     },
     dataChange: function() {
-      //this.job('change', function() {
-        if (this.data) {
-          this.keys = this.data ? Object.keys(this.data) : [];
-        }
-        this.fire('data-change');
-      //});
+      this.keys = this.data ? Object.keys(this.data) : [];
+      this.fire('data-change');
     },
     //
     // client-side effects