diff --git a/src/page.html b/src/page.html
index 617778c..3b47353 100644
--- a/src/page.html
+++ b/src/page.html
@@ -562,6 +562,7 @@ function loadTree(){
     fetch("/api/v2/tree/"+user+"?mode="+_tm,{
         headers:{'Authorization':'Bearer '+token}
     }).then(function(r){return r.json()}).then(function(d){
+        _td=d;
         _td=d;
         var h="";
         // Mode buttons
@@ -896,13 +897,14 @@ function organizeTree(){
 
     var files=_td.nodes.filter(function(n){
         if(n.node_type!="file"||!n.parent_id)return false;
-        // Already in a category folder?
         var inCat=false;
         for(var k in targets){if(n.parent_id==targets[k]){inCat=true;break}}
         return !inCat;
     });
     if(!files.length){toast("All files already organized ✓");return}
 
+    var token=localStorage.getItem('tree_token');
+    var user=_tree_user||localStorage.getItem('tree_user')||'demo';
     var mover=function(idx){
         if(idx>=files.length){loadTree();toast("Agent: "+files.length+" files organized");return}
         var f=files[idx];
@@ -913,7 +915,7 @@ function organizeTree(){
         else if(/cartoon|alice|felix|disney|steamboat|animal/.test(nl))t="Cartoons";
         var pid=targets[t];
         if(!pid){mover(idx+1);return}
-        fetch("/api/v2/tree/demo/node/"+f.node_id+"/move",{method:"PUT",headers:{"Content-Type":"application/json"},
+        fetch("/api/v2/tree/"+user+"/node/"+f.node_id+"/move",{method:"PUT",headers:{"Content-Type":"application/json","Authorization":"Bearer "+token},
             body:JSON.stringify({parent_id:pid})})
         .then(function(r){return r.json()}).then(function(){mover(idx+1);})
         .catch(function(){mover(idx+1);});