diff --git a/backend/apis/GoogleSolarApi.py b/backend/apis/GoogleSolarApi.py
index f1e3d2e9..c82c9c9a 100644
--- a/backend/apis/GoogleSolarApi.py
+++ b/backend/apis/GoogleSolarApi.py
@@ -491,6 +491,7 @@ class GoogleSolarApi:
 
             panel_performance["n_panels"] = panel_performance["n_panels_halved"]
             panel_performance = panel_performance.drop(columns=["n_panels_halved"])
+            panel_performance = panel_performance[panel_performance["n_panels"] >= min_panels]
 
         self.panel_performance = panel_performance
 
diff --git a/recommendations/WallRecommendations.py b/recommendations/WallRecommendations.py
index 69bfdfb4..4902ae03 100644
--- a/recommendations/WallRecommendations.py
+++ b/recommendations/WallRecommendations.py
@@ -69,6 +69,7 @@ class WallRecommendations(Definitions):
         "Timber frame, as built, no insulation": "Timber frame, with external insulation",
         'Timber frame, as built, partial insulation': 'Timber frame, with external insulation',
         "Sandstone or limestone, as built, no insulation": "Sandstone or limestone, with external insulation",
+        "Sandstone, as built, no insulation": "Sandstone, with external insulation",
     }
 
     # These are the ending descriptions we consider for walls with internal insulation
@@ -83,6 +84,7 @@ class WallRecommendations(Definitions):
         "Timber frame, as built, no insulation": "Timber frame, with internal insulation",
         'Timber frame, as built, partial insulation': 'Timber frame, with internal insulation',
         "Sandstone or limestone, as built, no insulation": "Sandstone or limestone, with internal insulation",
+        "Sandstone, as built, no insulation": "Sandstone, with internal insulation",
     }
 
     def __init__(
@@ -486,6 +488,10 @@ class WallRecommendations(Definitions):
                         material=material.to_dict(),
                     )
 
+                    already_installed = material["type"] in self.property.already_installed
+                    if already_installed:
+                        cost_result = override_costs(cost_result)
+
                     if material["type"] == "internal_wall_insulation":
 
                         if iwi_non_invasive_recommendations.get("cost") is not None:
@@ -496,13 +502,6 @@ class WallRecommendations(Definitions):
                         sap_points = iwi_non_invasive_recommendations.get("sap_points", None)
                         survey = iwi_non_invasive_recommendations.get("survey", False)
 
-                        already_installed = (
-                            "internal_wall_insulation"
-                            in self.property.already_installed
-                        )
-                        if already_installed:
-                            cost_result = override_costs(cost_result)
-
                         new_description = self.get_internal_external_wall_description(
                             self.INTERNALLY_INSULATED_WALL_DESCRIPTIONS, new_u_value
                         )
@@ -512,13 +511,6 @@ class WallRecommendations(Definitions):
                         sap_points = ewi_non_invasive_recommendations.get("sap_points", None)
                         survey = ewi_non_invasive_recommendations.get("survey", False)
 
-                        already_installed = (
-                            "external_wall_insulation"
-                            in self.property.already_installed
-                        )
-                        if already_installed:
-                            cost_result = override_costs(cost_result)
-
                         new_description = self.get_internal_external_wall_description(
                             self.EXTERNALLY_INSULATED_WALL_DESCRIPTIONS, new_u_value
                         )