diff --git a/ClientAdvisor/App/app.py b/ClientAdvisor/App/app.py
index e8221243..20446108 100644
--- a/ClientAdvisor/App/app.py
+++ b/ClientAdvisor/App/app.py
@@ -963,6 +963,7 @@ async def stream_chat_request(request_body, request_headers):
         if client_id is None:
             return jsonify({"error": "No client ID provided"}), 400
         query = request_body.get("messages")[-1].get("content")
+        query = query.strip()
 
         async def generate():
             deltaText = ""
@@ -1546,12 +1547,12 @@ def get_users():
             ClientSummary,
             CAST(LastMeeting AS DATE) AS LastMeetingDate,
             FORMAT(CAST(LastMeeting AS DATE), 'dddd MMMM d, yyyy') AS LastMeetingDateFormatted,
-            FORMAT(LastMeeting, 'hh:mm tt') AS LastMeetingStartTime,
-            FORMAT(LastMeetingEnd, 'hh:mm tt') AS LastMeetingEndTime,
+            FORMAT(LastMeeting, 'HH:mm ') AS LastMeetingStartTime,
+            FORMAT(LastMeetingEnd, 'HH:mm') AS LastMeetingEndTime,
             CAST(NextMeeting AS DATE) AS NextMeetingDate,
             FORMAT(CAST(NextMeeting AS DATE), 'dddd MMMM d, yyyy') AS NextMeetingFormatted,
-            FORMAT(NextMeeting, 'hh:mm tt') AS NextMeetingStartTime,
-            FORMAT(NextMeetingEnd, 'hh:mm tt') AS NextMeetingEndTime
+            FORMAT(NextMeeting, 'HH:mm') AS NextMeetingStartTime,
+            FORMAT(NextMeetingEnd, 'HH:mm') AS NextMeetingEndTime
         FROM (
             SELECT ca.ClientId, Client, Email, AssetValue, ClientSummary, LastMeeting, LastMeetingEnd, NextMeeting, NextMeetingEnd
             FROM (
diff --git a/ClientAdvisor/AzureFunction/function_app.py b/ClientAdvisor/AzureFunction/function_app.py
index f9bfd8dc..7b99ca69 100644
--- a/ClientAdvisor/AzureFunction/function_app.py
+++ b/ClientAdvisor/AzureFunction/function_app.py
@@ -100,6 +100,7 @@ def get_SQL_Response(
         Do not include assets values unless asked for.
         Always use ClientId = {clientid} in the query filter.
         Always return client name in the query.
+        If a question involves date and time, always use FORMAT(YourDateTimeColumn, 'yyyy-MM-dd HH:mm:ss') in the query.
         Only return the generated sql query. do not return anything else''' 
         try:
 
@@ -265,6 +266,7 @@ async def stream_openai_text(req: Request) -> StreamingResponse:
     Only use the client name returned from database in the response.
     If you cannot answer the question, always return - I cannot answer this question from the data available. Please rephrase or add more details.
     ** Remove any client identifiers or ids or numbers or ClientId in the final response.
+    Always return time in "HH:mm" format for the client in response.
     '''
 
     user_query = query.replace('?',' ')