diff --git a/demos/function_calling/Arch-Function-Calling-1.5B-Q4_K_M.model_file b/demos/function_calling/Arch-Function-Calling-1.5B-Q4_K_M.model_file
index 855ca44e..fe09e1b9 100644
--- a/demos/function_calling/Arch-Function-Calling-1.5B-Q4_K_M.model_file
+++ b/demos/function_calling/Arch-Function-Calling-1.5B-Q4_K_M.model_file
@@ -4,8 +4,9 @@ FROM Arch-Function-Calling-1.5B-Q4_K_M.gguf
 PARAMETER num_predict 1024
 PARAMETER temperature 0.001
 PARAMETER top_p 1.0
-PARAMETER top_k 16000
+PARAMETER top_k 50
 PARAMETER repeat_penalty 1.0
+PARAMETER stop "<|im_start|>"
 PARAMETER stop "<|im_end|>"
 
 # Set the random number seed to use for generation
@@ -15,7 +16,8 @@ PARAMETER seed 42
 TEMPLATE """
 {{- if .System }}<|im_start|>system
 {{ .System }}<|im_end|>
-{{ end }}{{ if .Prompt }}<|im_start|>user
+{{ end }}{{ if .Prompt }}
+<|im_start|>user
 {{ .Prompt }}<|im_end|>
 {{ end }}<|im_start|>assistant
 {{ .Response }}<|im_end|>"""
diff --git a/demos/function_calling/bolt_config.yaml b/demos/function_calling/bolt_config.yaml
index 941eb457..065beb03 100644
--- a/demos/function_calling/bolt_config.yaml
+++ b/demos/function_calling/bolt_config.yaml
@@ -42,9 +42,9 @@ prompt_targets:
         description: The policy number for which the insurance claim details are requested.
         type: string
       - name: include_expired
-        description: Include expired insurance claims in the response.
-        type: string
-        default: "false"
+        description: whether to include expired insurance claims in the response.
+        type: bool
+        required: true
     endpoint:
       cluster: api_server
       path: /insurance_claim_details
diff --git a/function_resolver/app/arch_handler.py b/function_resolver/app/arch_handler.py
index 77b0a65d..35507d6f 100644
--- a/function_resolver/app/arch_handler.py
+++ b/function_resolver/app/arch_handler.py
@@ -43,7 +43,6 @@ class ArchHandler:
             + ARCH_FUNCTION_CALLING_TOOL_PROMPT.format(tool_text=tool_text)
             + "\n\n"
             + ARCH_FUNCTION_CALLING_FORMAT_PROMPT
-            + "\n"
         )
 
         return system_prompt