diff --git a/firestore/firestore-query.js b/firestore/firestore-query.js
index d92b96a..b92aefc 100644
--- a/firestore/firestore-query.js
+++ b/firestore/firestore-query.js
@@ -33,18 +33,18 @@ module.exports = function(RED) {
 
         let dir = msg.payload.orderDirection ? msg.payload.orderDirection : 'desc'
 
-        if(msg.payload.orderBy){
+        if(typeof msg.payload.orderBy !== 'undefined'){
           console.log('orderBy dir = '+dir)
           ref = ref.orderBy(msg.payload.orderBy, dir)
         }
-        if(msg.payload.limit){
+        if(typeof msg.payload.limit  !== 'undefined'){
           ref = ref.limit(msg.payload.limit)
         }
-        if(msg.payload.startAt){
+        if(typeof msg.payload.startAt !== 'undefined'){
           console.log('startAt '+msg.payload.startAt)
           ref = ref.startAt(msg.payload.startAt)
         }
-        if(msg.payload.endAt){
+        if(typeof msg.payload.endAt  !== 'undefined'){
           console.log('endAt '+msg.payload.endAt)
           ref = ref.endAt(msg.payload.endAt)
         }
diff --git a/package.json b/package.json
index 798c3cf..fc424ce 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-firebase-admin",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "description": "A node-red module that wraps the server-side  admin SDK of firebase, firestore, et.c.",
   "main": "index.js",
   "scripts": {
diff --git a/rtdb/rtdb-query.js b/rtdb/rtdb-query.js
index 7e341b2..327b48d 100644
--- a/rtdb/rtdb-query.js
+++ b/rtdb/rtdb-query.js
@@ -34,13 +34,13 @@ module.exports = function(RED) {
 
         // Decorate with queries
         if(msg.payload.queries && msg.payload.queries.length > 0){
-          console.log('found queries')
+          console.log('---------------------  found queries')
           let ordered = false
           msg.payload.queries.forEach((query)=>{
             console.dir(query)
-            if(query.orderBy){
+            if(typeof query.orderBy !== 'undefined'){
               ordered = true
-              console.log('setting explicit orderBy')
+              console.log('------- setting explicit orderBy')
               if(query.orderBy === 'value'){
                 ref = ref.orderByValue()
               } else if(query.orderBy === 'key'){
@@ -49,20 +49,20 @@ module.exports = function(RED) {
                 ref = ref.orderByChild(query.value)
               }
             }
-            if(query.startAt){
-              console.log('startAt '+query.startAt)
+            if(typeof query.startAt !== 'undefined'){
+              console.log('------- startAt '+query.startAt)
               ref = ref.startAt(query.startAt)
             }
-            if(query.endAt){
-              console.log('endAt '+query.endAt)
+            if(typeof query.endAt !== 'undefined'){
+              console.log('------- endAt '+query.endAt)
               ref = ref.endAt(query.endAt)
             }
-            if(query.equalTo){
-              console.log('equalTo '+query.equalTo)
+            if(typeof query.equalTo !== 'undefined'){
+              console.log('------- equalTo '+query.equalTo)
               ref = ref.equalTo(query.equalTo)
             }
-            if(query.limitTo){
-              console.log('limitTo '+query.limitTo+' -> '+query.value)
+            if(typeof query.limitTo !== 'undefined'){
+              console.log('------- limitTo '+query.limitTo+' -> '+query.value)
               if(query.limitTo === 'first'){
                 ref = ref.limitToFirst(query.value)
               } else if(query.limitTo === 'last'){
@@ -76,8 +76,8 @@ module.exports = function(RED) {
           }
         }
 
-        console.log('finished rtdb query is')
-        console.dir(ref.queryParams_)
+        //console.log('finished rtdb query is')
+        //console.dir(ref.queryParams_)
 
         ref.on(eventtype, cb)
         oldpath = path