diff --git a/app/db_sql.py b/app/db_sql.py
index f0980c7..5a3230e 100644
--- a/app/db_sql.py
+++ b/app/db_sql.py
@@ -529,8 +529,8 @@ def sql_select(
         record_id_random: str|None = None,
         field_name: str|None = None,
         field_value = None,
-        enabled: str = 'enabled', # enabled, disabled, all
-        hidden: str = 'not_hidden', # hidden, not_hidden, all
+        enabled: str|None = None, # enabled, disabled, all
+        hidden: str|None = None, # hidden, not_hidden, all
         limit: int = 9999999,
         offset: int = 0,
         sql: str|None = None,
@@ -549,6 +549,16 @@ def sql_select(
     else:
         sql_limit_offset = ''
 
+    # if enabled:
+    #     sql_enabled = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str
+    # else:
+    #     sql_enabled = ''
+
+    # if hidden:
+    #     sql_hidden = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str
+    # else:
+    #     sql_hidden = ''
+
     if table_name and not (record_id or record_id_random or field_name or field_value or sql or data):
         # Select all records from a table
         # Updated 2023-07-06
@@ -557,9 +567,24 @@ def sql_select(
         # NOTE: This is new and currently only working with the API CRUD list endpoint and the sql_select function calls. -2023-07-06
         # NOTE: This call (without field_name, field_value) may need more testing.
         data = {}
-        sql_enabled, data['enable'] = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str and bool
 
-        sql_hidden, data['hidden'] = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str and bool
+        if enabled:
+            sql_enabled, data['enabled'] = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str
+        else:
+            sql_enabled = ''
+            # data['enabled'] = ''
+
+        if hidden:
+            sql_hidden, data['hidden'] = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str
+        else:
+            sql_hidden = ''
+            # data['hidden'] = ''
+        # if sql_enabled:
+        #     data['enable'] = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str and bool
+
+        # if sql_hidden:
+        #     sql_hidden = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str and bool
+        # sql_hidden, data['hidden'] = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str and bool
 
         sql = text(
             f"""
@@ -607,9 +632,27 @@ def sql_select(
         data = {}
         data[field_name] = field_value
 
-        sql_enabled, data['enable'] = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str and bool
+        if enabled:
+            sql_enabled, data['enabled'] = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str
+        else:
+            sql_enabled = ''
+            # data['enabled'] = ''
 
-        sql_hidden, data['hidden'] = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str and bool
+        if hidden:
+            sql_hidden, data['hidden'] = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str
+        else:
+            sql_hidden = ''
+            # data['hidden'] = ''
+
+        # if sql_enabled:
+        #     data['enable'] = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str and bool
+
+        # if sql_hidden:
+        #     data['hidden'] = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str and bool
+
+        # sql_enabled, data['enable'] = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str and bool
+#
+        # sql_hidden, data['hidden'] = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str and bool
 
         sql = text(
             f"""