diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/api.yml b/spiffworkflow-backend/src/spiffworkflow_backend/api.yml
index 50fb6f87..59d156e6 100755
--- a/spiffworkflow-backend/src/spiffworkflow_backend/api.yml
+++ b/spiffworkflow-backend/src/spiffworkflow_backend/api.yml
@@ -397,6 +397,12 @@ paths:
         description: the modified process model id
         schema:
           type: string
+      - name: include_file_references
+        in: query
+        required: false
+        description: include all file references in the return
+        schema:
+          type: boolean
     get:
       operationId: spiffworkflow_backend.routes.process_models_controller.process_model_show
       summary: Returns a single process model
diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_models_controller.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_models_controller.py
index 3b5b17f2..d68f7d1a 100644
--- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_models_controller.py
+++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_models_controller.py
@@ -123,7 +123,7 @@ def process_model_update(
     return ProcessModelInfoSchema().dump(process_model)
 
 
-def process_model_show(modified_process_model_identifier: str) -> Any:
+def process_model_show(modified_process_model_identifier: str, include_file_references: bool = False) -> Any:
     """Process_model_show."""
     process_model_identifier = modified_process_model_identifier.replace(":", "/")
     process_model = _get_process_model(process_model_identifier)
@@ -132,8 +132,10 @@ def process_model_show(modified_process_model_identifier: str) -> Any:
         key=lambda f: "" if f.name == process_model.primary_file_name else f.sort_index,
     )
     process_model.files = files
-    for file in process_model.files:
-        file.references = SpecFileService.get_references_for_file(file, process_model)
+
+    if include_file_references:
+        for file in process_model.files:
+            file.references = SpecFileService.get_references_for_file(file, process_model)
 
     process_model.parent_groups = ProcessModelService.get_parent_group_array(
         process_model.id
diff --git a/spiffworkflow-frontend/src/components/ProcessModelSearch.tsx b/spiffworkflow-frontend/src/components/ProcessModelSearch.tsx
index bd995bc3..b7debc6b 100644
--- a/spiffworkflow-frontend/src/components/ProcessModelSearch.tsx
+++ b/spiffworkflow-frontend/src/components/ProcessModelSearch.tsx
@@ -37,7 +37,9 @@ export default function ProcessModelSearch({
   const shouldFilterProcessModel = (options: any) => {
     const processModel: ProcessModel = options.item;
     const { inputValue } = options;
-    return getFullProcessModelLabel(processModel).includes(inputValue);
+    return getFullProcessModelLabel(processModel)
+      .toLowerCase()
+      .includes((inputValue || '').toLowerCase());
   };
   return (
     <ComboBox
diff --git a/spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx b/spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx
index 0e76c5ce..f6af667e 100644
--- a/spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx
+++ b/spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx
@@ -134,7 +134,7 @@ export default function ProcessModelEditDiagram() {
       setProcessModel(result);
     };
     HttpService.makeCallToBackend({
-      path: `/${processModelPath}`,
+      path: `/${processModelPath}?include_file_references=true`,
       successCallback: processResult,
     });
   }, [processModelPath]);