diff --git a/pub/tree/src/js/components/Async.coffee b/pub/tree/src/js/components/Async.coffee
index 8ac25c9a8..4eb41a21c 100644
--- a/pub/tree/src/js/components/Async.coffee
+++ b/pub/tree/src/js/components/Async.coffee
@@ -34,7 +34,7 @@ module.exports = (queries, Child, load=_load)-> recl
   filterWith: (have,_queries)->
     return _queries unless have?
     request = {}
-    for k of _queries
+    for k of _queries when k isnt 'kids'
       request[k] = _queries[k] unless have[k] isnt undefined
     if _queries.kids? and have.kids?
       if _.isEmpty have.kids
diff --git a/pub/tree/src/js/main.js b/pub/tree/src/js/main.js
index d7ae996c2..01394d57c 100644
--- a/pub/tree/src/js/main.js
+++ b/pub/tree/src/js/main.js
@@ -35,6 +35,7 @@ module.exports = {
 };
 
 
+
 },{"../dispatcher/Dispatcher.coffee":14,"../persistence/TreePersistence.coffee":20}],2:[function(require,module,exports){
 var BodyComponent, CLICK, Links, TreeActions, TreeStore, a, clas, div, query, reactify, recl, ref;
 
@@ -288,6 +289,7 @@ module.exports = query({
 }));
 
 
+
 },{"../actions/TreeActions.coffee":1,"../stores/TreeStore.coffee":21,"./Async.coffee":3,"./BodyComponent.coffee":4,"./Reactify.coffee":11,"classnames":16}],3:[function(require,module,exports){
 var TreeActions, TreeStore, _load, code, div, recl, ref, span;
 
@@ -348,8 +350,10 @@ module.exports = function(queries, Child, load) {
       }
       request = {};
       for (k in _queries) {
-        if (have[k] === void 0) {
-          request[k] = _queries[k];
+        if (k !== 'kids') {
+          if (have[k] === void 0) {
+            request[k] = _queries[k];
+          }
         }
       }
       if ((_queries.kids != null) && (have.kids != null)) {
@@ -389,6 +393,7 @@ module.exports = function(queries, Child, load) {
 };
 
 
+
 },{"../actions/TreeActions.coffee":1,"../stores/TreeStore.coffee":21,"./LoadComponent.coffee":10}],4:[function(require,module,exports){
 var div, query, reactify, recl;
 
@@ -414,6 +419,7 @@ module.exports = query({
 }));
 
 
+
 },{"./Async.coffee":3,"./Reactify.coffee":11}],5:[function(require,module,exports){
 var div, recl, ref, textarea;
 
@@ -437,6 +443,7 @@ module.exports = recl({
 });
 
 
+
 },{}],6:[function(require,module,exports){
 var div, recl;
 
@@ -459,6 +466,7 @@ module.exports = {
 };
 
 
+
 },{"./CodeMirror.coffee":5,"./EmailComponent.coffee":7,"./KidsComponent.coffee":8,"./ListComponent.coffee":9,"./SearchComponent.coffee":12,"./TocComponent.coffee":13}],7:[function(require,module,exports){
 var button, div, input, p, reactify, recl, ref;
 
@@ -537,6 +545,7 @@ module.exports = recl({
 });
 
 
+
 },{"./Reactify.coffee":11}],8:[function(require,module,exports){
 var a, div, hr, li, query, reactify, recl, ref, ul;
 
@@ -576,6 +585,7 @@ module.exports = query({
 }));
 
 
+
 },{"./Async.coffee":3,"./Reactify.coffee":11}],9:[function(require,module,exports){
 var a, clas, div, h1, li, query, reactify, recl, ref, ul;
 
@@ -671,6 +681,7 @@ module.exports = query({
 }));
 
 
+
 },{"./Async.coffee":3,"./Reactify.coffee":11,"classnames":16}],10:[function(require,module,exports){
 var div, input, recl, ref, textarea;
 
@@ -711,6 +722,7 @@ module.exports = recl({
 });
 
 
+
 },{}],11:[function(require,module,exports){
 var Virtual, div, load, reactify, recl, ref, rele, span, walk;
 
@@ -778,6 +790,7 @@ module.exports = _.extend(reactify, {
 });
 
 
+
 },{"./LoadComponent.coffee":10}],12:[function(require,module,exports){
 var a, div, input, query, reactify, recl, ref,
   slice = [].slice;
@@ -916,6 +929,7 @@ module.exports = query({
 }));
 
 
+
 },{"./Async.coffee":3,"./Reactify.coffee":11}],13:[function(require,module,exports){
 var div, query, reactify, recl;
 
@@ -1048,6 +1062,7 @@ module.exports = query({
 }));
 
 
+
 },{"./Async.coffee":3,"./Reactify.coffee":11}],14:[function(require,module,exports){
 var Dispatcher;
 
@@ -1069,6 +1084,7 @@ module.exports = _.extend(new Dispatcher(), {
 });
 
 
+
 },{"flux":17}],15:[function(require,module,exports){
 var rend;
 
@@ -1215,6 +1231,7 @@ $(function() {
 });
 
 
+
 },{"./actions/TreeActions.coffee":1,"./components/AnchorComponent.coffee":2,"./components/BodyComponent.coffee":4,"./components/Components.coffee":6,"./persistence/TreePersistence.coffee":20}],16:[function(require,module,exports){
 /*!
   Copyright (c) 2015 Jed Watson.
@@ -1635,6 +1652,7 @@ module.exports = {
 };
 
 
+
 },{}],21:[function(require,module,exports){
 var EventEmitter, MessageDispatcher, QUERIES, TreeStore, _curr, _data, _tree, clog;
 
@@ -1687,7 +1705,7 @@ TreeStore = _.extend(EventEmitter.prototype, {
       }
       data[k] = (ref = _data[path]) != null ? ref[k] : void 0;
     }
-    if (query.kids) {
+    if (query.kids && !_data.EMPTY) {
       data.kids = {};
       for (k in tree) {
         sub = tree[k];
@@ -1744,6 +1762,7 @@ TreeStore = _.extend(EventEmitter.prototype, {
       this.loadValues(tree[k], path + "/" + k, v);
     }
     if (data.kids && _.isEmpty(data.kids)) {
+      _data.EMPTY = true;
       old.body = {
         gn: 'div',
         c: [
@@ -1870,6 +1889,7 @@ TreeStore.dispatchToken = MessageDispatcher.register(function(payload) {
 module.exports = TreeStore;
 
 
+
 },{"../dispatcher/Dispatcher.coffee":14,"events":22}],22:[function(require,module,exports){
 // Copyright Joyent, Inc. and other Node contributors.
 //
diff --git a/pub/tree/src/js/stores/TreeStore.coffee b/pub/tree/src/js/stores/TreeStore.coffee
index 36bdaeaeb..fab973dfe 100644
--- a/pub/tree/src/js/stores/TreeStore.coffee
+++ b/pub/tree/src/js/stores/TreeStore.coffee
@@ -24,7 +24,7 @@ TreeStore = _.extend EventEmitter.prototype, {
     for k,t of query when QUERIES[k]
       if t isnt QUERIES[k] then throw TypeError "Wrong query type: #{k}, '#{t}'"
       data[k] = _data[path]?[k]
-    if query.kids
+    if query.kids and not _data.EMPTY
       data.kids = {}
       for k,sub of tree
         data.kids[k] = @fulfillAt sub, path+"/"+k, query.kids
@@ -54,6 +54,7 @@ TreeStore = _.extend EventEmitter.prototype, {
       @loadValues tree[k], path+"/"+k, v
       
     if data.kids && _.isEmpty data.kids
+      _data.EMPTY = true
       old.body =
         gn: 'div'
         c: [ {gn:'h1',  ga:{className:'error'}, c:['Error: Empty path']}