diff --git a/app/methods/event_methods.py b/app/methods/event_methods.py
index aadc621..0b17d4d 100644
--- a/app/methods/event_methods.py
+++ b/app/methods/event_methods.py
@@ -73,8 +73,15 @@ def load_event_obj(
     if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
     else: return False
 
-    if event_rec := sql_select(table_name='v_event', record_id=event_id): pass
-    else: return False
+    if inc_file_count:
+        log.info('Using view with file count')
+        if event_rec := sql_select(table_name='v_event_w_file_count', record_id=event_id): pass
+        else:
+            return False
+    else:
+        if event_rec := sql_select(table_name='v_event', record_id=event_id): pass
+        else:
+            return False
 
     #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(event_rec)
@@ -318,7 +325,7 @@ def get_event_rec_list(
         archived: str = 'archived', # archived, not_archived, all
         conference: bool = False, # If it is a conference then organization, person, and user are queried as participants (not the owner/organizer)
         ) -> list|bool:
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     if account_id or organization_id or person_id or user_id: pass
diff --git a/app/methods/event_presentation_methods.py b/app/methods/event_presentation_methods.py
index 81778f7..b63a8b9 100644
--- a/app/methods/event_presentation_methods.py
+++ b/app/methods/event_presentation_methods.py
@@ -51,7 +51,7 @@ def load_event_presentation_obj(
         exclude_unset: bool = True,
         model_as_dict: bool = False,
         ) -> Event_Presentation_Base|bool:
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     if event_presentation_id := redis_lookup_id_random(record_id_random=event_presentation_id, table_name='event_presentation'): pass
@@ -89,7 +89,7 @@ def load_event_presentation_obj(
 
     # Updated 2021-11-05
     if inc_event_file_list:
-        log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         log.info('Need to include event file list...')
 
         from app.methods.event_file_methods import get_event_file_rec_list, load_event_file_obj
@@ -126,7 +126,7 @@ def load_event_presentation_obj(
     if inc_event_person_list: pass
 
     if inc_event_presenter_list:
-        log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
 
         data = {}
         data['event_presentation_id'] = event_presentation_id
@@ -236,7 +236,7 @@ def get_event_presentation_rec_list(
         review: str = 'all', # ready, not_ready, all
         limit: int = 100,
         ) -> list|bool:
-    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     if event_person_id := redis_lookup_id_random(record_id_random=event_person_id, table_name='event_person'): pass
@@ -302,7 +302,7 @@ def get_event_presentation_rec_list(
         event_presentation_rec_li = event_presentation_rec_li_result
     else:
         event_presentation_rec_li = []
-    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(event_presentation_rec_li_result)
     log.debug(type(event_presentation_rec_li))
     log.debug(len(event_presentation_rec_li))
@@ -332,9 +332,7 @@ def get_event_id_w_event_session_id(
         LIMIT 1;
         """
 
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     if event_session_data_result := sql_select(data=data, sql=sql):
-        log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         log.debug(event_session_data_result)
         if event_id := event_session_data_result.get('event_id', None): return event_id
         else: return False
diff --git a/app/methods/event_session_methods.py b/app/methods/event_session_methods.py
index 066b5a2..6ec5bf1 100644
--- a/app/methods/event_session_methods.py
+++ b/app/methods/event_session_methods.py
@@ -91,7 +91,7 @@ def load_event_session_obj(
     if inc_event_device_list: pass
 
     if inc_event_file_list:
-        log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         log.info('Need to include event file list...')
 
         from app.methods.event_file_methods import get_event_file_rec_list, load_event_file_obj
@@ -150,7 +150,7 @@ def load_event_session_obj(
     if inc_event_person_list: pass
 
     if inc_event_presentation_list:
-        log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         log.info('Need to include event presentation list...')
 
         data = {}
@@ -192,9 +192,7 @@ def load_event_session_obj(
             ORDER BY `event_presentation`.priority DESC, `event_presentation`.sort ASC, `event_presentation`.start_datetime ASC, `event_presentation`.sort ASC, `event_presentation`.name ASC, `event_presentation`.created_on DESC, `event_presentation`.updated_on DESC;
             """
 
-        #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         if event_presentation_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
-            #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
             log.debug(event_presentation_rec_li_result)
             event_presentation_obj_li = []
             for event_presentation_rec in event_presentation_rec_li_result:
@@ -229,8 +227,8 @@ def load_event_session_obj(
         log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
 
     if inc_event_presenter_cat:
+        # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         log.info(f'Need to get event presenter cat list for session. Event Session ID: {event_session_id}')
-        log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         data = {}
         data['event_session_id'] = event_session_id
 
@@ -281,7 +279,7 @@ def get_event_session_rec_list(
         review: str = 'all', # ready, not_ready, all
         limit: int = 100,
         ) -> list|bool:
-    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
diff --git a/app/models/event_file_models.py b/app/models/event_file_models.py
index 1f404cf..edd5cb8 100644
--- a/app/models/event_file_models.py
+++ b/app/models/event_file_models.py
@@ -59,7 +59,7 @@ class Event_File_Base(BaseModel):
 
     #### NOTE ***** NOTE
     internal_os: Optional[str]
-    public_use: Optional[bool]
+    public_use: Optional[bool] = False
     public: Optional[bool]
     approve: Optional[bool]
     #### internal_os needs to be set
diff --git a/app/routers/event.py b/app/routers/event.py
index 375f435..b88ab9b 100644
--- a/app/routers/event.py
+++ b/app/routers/event.py
@@ -113,7 +113,7 @@ async def get_event_obj_li(
         exclude_unset: bool = True,
         response: Response = Response,
         ):
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     data = {}
@@ -242,13 +242,14 @@ async def get_event_obj(
         inc_product: bool = False,
         inc_product_list: bool = False,
         inc_user: bool = False,
+        inc_file_count: bool = False, # NOTE: file counts are from separate views
         x_account_id: str = Header(...),
         limit: int = 500, # For now this covers any included objects or object lists
         by_alias: Optional[bool] = True,
         exclude_unset: Optional[bool] = True,
         response: Response = Response,
         ):
-    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
@@ -261,6 +262,7 @@ async def get_event_obj(
         approved = approved,
         hidden = hidden,
         review = review,
+        inc_file_count = inc_file_count,
         inc_address = inc_address,
         # inc_address_location = inc_address_location,
         inc_contact = inc_contact,
@@ -346,7 +348,7 @@ async def get_account_obj_event_list(
         exclude_unset: Optional[bool] = True,
         response: Response = Response,
         ):
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass
diff --git a/app/routers/event_presentation.py b/app/routers/event_presentation.py
index 48e2370..a5085a6 100644
--- a/app/routers/event_presentation.py
+++ b/app/routers/event_presentation.py
@@ -140,7 +140,7 @@ async def get_event_presentation_obj(
         exclude_unset: Optional[bool] = True,
         response: Response = Response,
         ):
-    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     if event_presentation_id := redis_lookup_id_random(record_id_random=event_presentation_id, table_name='event_presentation'): pass
@@ -202,7 +202,7 @@ async def get_event_session_event_presentation_li(
         exclude_unset: Optional[bool] = True,
         response: Response = Response,
         ):
-    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass
diff --git a/app/routers/event_session.py b/app/routers/event_session.py
index 9efe17c..79ba76d 100644
--- a/app/routers/event_session.py
+++ b/app/routers/event_session.py
@@ -140,7 +140,7 @@ async def post_event_session_obj(
         exclude_unset: Optional[bool] = True,
         response: Response = Response,
         ):
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     obj_type = 'event_session'
@@ -168,7 +168,7 @@ async def post_event_session_obj_new_v3(
         exclude_unset: bool = True,
         response: Response = Response,
         ):
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     # There should probably be a check for the event ID before calling the create function?
@@ -214,7 +214,7 @@ async def patch_event_session_obj_exist_v3(
         exclude_none: Optional[bool] = True,
         response: Response = Response,
         ):
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass
@@ -255,7 +255,7 @@ async def patch_event_session_obj(
         exclude_unset: Optional[bool] = True,
         response: Response = Response,
         ):
-    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     obj_type = 'event_session'
@@ -296,7 +296,7 @@ async def patch_event_session_json(
         exclude_none: Optional[bool] = True,
         response: Response = Response,
         ):
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass
@@ -370,7 +370,7 @@ async def get_event_session_obj_li(
         exclude_unset: bool = True,
         response: Response = Response,
         ):
-    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     data = {}
@@ -495,7 +495,7 @@ async def get_event_session_obj(
         exclude_unset: Optional[bool] = True,
         response: Response = Response,
         ):
-    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass
@@ -564,7 +564,7 @@ async def get_event_event_session_obj_li(
         exclude_unset: Optional[bool] = True,
         response: Response = Response,
         ):
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
@@ -628,7 +628,7 @@ async def search_event_session_obj_li(
         exclude_unset: bool = True,
         response: Response = Response,
         ):
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     data = {}
@@ -689,7 +689,7 @@ async def delete_event_session_obj(
         x_account_id: str = Header(...),
         response: Response = Response,
         ):
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     obj_type = 'event_session'
diff --git a/app/routers/hosted_file.py b/app/routers/hosted_file.py
index 256e62f..4163415 100644
--- a/app/routers/hosted_file.py
+++ b/app/routers/hosted_file.py
@@ -188,6 +188,9 @@ async def upload_files_fake(
         log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         log.debug(file_info)
 
+        original_filename = file_info.get('filename', None)
+        original_extension = file_info.get('extension', None)
+
         # "saved" means that the file was or is now saved on the file server
         if file_info['saved']:
             # Create a new host_file object entry
@@ -342,6 +345,10 @@ async def upload_files_fake(
         hosted_file_dict['already_exists'] = file_info['already_exists']
         hosted_file_dict['saved'] = file_info['saved']
         hosted_file_dict['copy_timer'] = file_info['copy_timer']
+
+        hosted_file_dict['filename'] = file_info['filename']
+        hosted_file_dict['extension'] = file_info['extension']
+
         log.debug(hosted_file_dict)
         hosted_file_list.append(hosted_file_dict)