Update app.py

app.py

@@ -183,6 +183,7 @@ def filter_results(results, country_filter, region_filter, end_year_range, crs_f
         crs_key = metadata.get("crs_key", "").strip()
         # Use lookup value instead of stored crs_value.
         new_crs_value = lookup_crs_value(crs_key)
+        new_crs_value = lookup_crs_value(crs_key).replace('.0', '')
         crs_combined = f"{crs_key}: {new_crs_value}" if crs_key else ""
 
         # Enforce CRS filter only if specified.
@@ -315,7 +316,7 @@ with col5:
 show_exact_matches = st.checkbox("Show only exact matches", value=False)
 
 if not var.strip():
-    st.info("Please enter a query to see results.")
+    st.info("Please enter a question to see results.")
 else:
     
     ###########################################
@@ -379,10 +380,10 @@ else:
                 # Create two columns: left for full description and right for additional details.
                 col_left, col_right = st.columns(2)
                 with col_left:
-                    # Combine preview and remainder into one full description block.
-                    full_description = preview_text + (" " + remainder_text if remainder_text else "")
-                    st.markdown(highlight_query(full_description, var), unsafe_allow_html=True)
-    
+                    st.markdown(highlight_query(preview_text, var), unsafe_allow_html=True)
+                    if remainder_text:
+                        with st.expander("Show more"):
+                            st.markdown(highlight_query(remainder_text, var), unsafe_allow_html=True)
                 with col_right:
                     # Format additional text with line breaks using <br>
                     start_year = metadata.get('start_year', None)
@@ -405,20 +406,21 @@ else:
                                 matched_countries.append(resolved_name)
                     crs_key = metadata.get("crs_key", "").strip()
                     new_crs_value = lookup_crs_value(crs_key)
+                    new_crs_value = lookup_crs_value(crs_key).replace('.0', '')
                     crs_combined = f"{crs_key}: {new_crs_value}" if crs_key else "Unknown"
                     client_name = metadata.get('client', 'Unknown Client')
                     contact = metadata.get("contact", "").strip()
+                    objective_highlighted = highlight_query(objective, var) if var.strip() else objective
                     additional_text = (
-                        f"Objective: **{objective}**<br>"
-                        f"Commissioned by **{client_name}**<br>"
-                        f"Projekt duration **{start_year_str}-{end_year_str}**<br>"
-                        f"Budget: Project: **{formatted_project_budget}**, Total volume: **{formatted_total_volume}**<br>"
-                        f"Country: **{', '.join(matched_countries)}**<br>"
-                        f"Sector: **{crs_combined}**"
+                        f"**Objective:** {objective_highlighted}<br>"
+                        f"**Commissioned by:** {client_name}<br>"
+                        f"**Projekt duration:** {start_year_str}-{end_year_str}<br>"
+                        f"**Budget:** Project: {formatted_project_budget}, Total volume: {formatted_total_volume}<br>"
+                        f"**Country:** {', '.join(matched_countries)}<br>"
+                        f"**Sector:** {crs_combined}"
                     )
-                    if contact and contact.lower() != "[email protected]":
-                        additional_text += f"<br>Contact: **{contact}**"
-                    st.markdown(additional_text, unsafe_allow_html=True)
+                    #if contact and contact.lower() != "[email protected]":
+                    #    additional_text += f"<br>**Contact:** {contact}"
                 st.divider()
     
     # --- Semantic Results Branch ---
@@ -473,18 +475,19 @@ else:
                                 matched_countries.append(resolved_name)
                     crs_key = metadata.get("crs_key", "").strip()
                     new_crs_value = lookup_crs_value(crs_key)
+                    new_crs_value = lookup_crs_value(crs_key).replace('.0', '')
                     crs_combined = f"{crs_key}: {new_crs_value}" if crs_key else "Unknown"
                     client_name = metadata.get('client', 'Unknown Client')
                     contact = metadata.get("contact", "").strip()
                     additional_text = (
-                        f"Objective: **{objective}**<br>"
-                        f"Commissioned by **{client_name}**<br>"
-                        f"Projekt duration **{start_year_str}-{end_year_str}**<br>"
-                        f"Budget: Project: **{formatted_project_budget}**, Total volume: **{formatted_total_volume}**<br>"
-                        f"Country: **{', '.join(matched_countries)}**<br>"
-                        f"Sector: **{crs_combined}**"
+                        f"**Objective:** {objective}<br>"
+                        f"**Commissioned by:** {client_name}<br>"
+                        f"**Projekt duration:** {start_year_str}-{end_year_str}<br>"
+                        f"**Budget:** Project: {formatted_project_budget}, Total volume: {formatted_total_volume}<br>"
+                        f"**Country:** {', '.join(matched_countries)}<br>"
+                        f"**Sector:** {crs_combined}"
                     )
-                    if contact and contact.lower() != "[email protected]":
-                        additional_text += f"<br>Contact: **{contact}**"
+                    #if contact and contact.lower() != "[email protected]":
+                    #    additional_text += f"<br>Contact: **{contact}**"
                     st.markdown(additional_text, unsafe_allow_html=True)
                 st.divider()