diff --git a/templates/states.html b/templates/states.html
index 338b55c..b1e81d9 100644
--- a/templates/states.html
+++ b/templates/states.html
@@ -16,13 +16,13 @@
         <div class="row">
             <div class="input-group">
                 <label class="py-1 input-group-text col-7 justify-content-end"><b>Import</b>&nbsp; path ordered by:</label>
-                {{CreateSelect( "noo", user.default_import_noo, ["Oldest", "Newest","A to Z", "Z to A"], "ChangeDefault();return false", "col-2 rounded-end")|safe }}
+                {{CreateSelect( "import_noo", user.default_import_noo, ["Oldest", "Newest","A to Z", "Z to A"], "ChangeDefault();return false", "col-2 rounded-end")|safe }}
             </div class="input-group">
         </div class="row">
         <div class="row">
             <div class="input-group">
                 <label class="py-1 input-group-text col-7 justify-content-end"><b>Storage</b>&nbsp; path ordered by:</label>
-                {{CreateSelect( "noo", user.default_storage_noo, ["Oldest", "Newest","A to Z", "Z to A"], "ChangeDefault();return false", "col-2 rounded-end")|safe }}
+                {{CreateSelect( "storage_noo", user.default_storage_noo, ["Oldest", "Newest","A to Z", "Z to A"], "ChangeDefault();return false", "col-2 rounded-end")|safe }}
             </div class="input-group">
         </div>
         <div class="row">
@@ -40,13 +40,13 @@
         <div class="row">
             <div class="input-group">
                 <label class="py-1 input-group-text col-7 justify-content-end">Folders or Flat view of thumbnails in &nbsp;<b>import</b>&nbsp; path:</label>
-                {{CreateSelect( "folders", user.default_import_folders, ["In Folder", "Flat View"], "ChangeDefault();return false", "col-2 rounded-end", { 0:true, 1:false } )|safe }}
+                {{CreateSelect( "import_folders", user.default_import_folders, ["In Folder", "Flat View"], "ChangeDefault();return false", "col-2 rounded-end", { 0:true, 1:false } )|safe }}
             </div>
         </div>
         <div class="row">
             <div class="input-group">
                 <label class="py-1 input-group-text col-7 justify-content-end">Folders or Flat view of thumbnails in &nbsp;<b>storage</b>&nbsp; path:</label>
-                {{CreateSelect( "folders", user.default_storage_folders, ["In Folder", "Flat View"], "ChangeDefault();return false", "col-2 rounded-end", { 0:true, 1:false } )|safe }}
+                {{CreateSelect( "storage_folders", user.default_storage_folders, ["In Folder", "Flat View"], "ChangeDefault();return false", "col-2 rounded-end", { 0:true, 1:false } )|safe }}
             </div>
         </div>
         <div class="row">
@@ -103,10 +103,12 @@ function ChangeDefault()
 {
     data="dn={{user.dn}}"
     data+="&default_size="+$('#size').val()
-    data+="&default_noo="+$('#noo').val()
+    data+="&default_import_noo="+$('#import_noo').val()
+    data+="&default_storage_noo="+$('#storage_noo').val()
     data+="&default_how_many="+$('#how_many').val()
     data+="&default_grouping="+$('#grouping').val()
-    data+="&default_folders="+$('#folders').val()
+    data+="&default_import_folders="+$('#import_folders').val()
+    data+="&default_storage_folders="+$('#storage_folders').val()
     data+="&default_fullscreen="+$('#fullscreen').val()
     console.log("Changing Default:"+data ) 
     $.ajax({ type: 'POST', data: data, url: '/changedefaults', success: function(data){ window.location='/states'; return false; } })