diff --git a/etl/eligibility/ha_15_32/ha16_app.py b/etl/eligibility/ha_15_32/ha16_app.py
index 4e5212eb..26cf1a0d 100644
--- a/etl/eligibility/ha_15_32/ha16_app.py
+++ b/etl/eligibility/ha_15_32/ha16_app.py
@@ -142,6 +142,16 @@ def load_data():
                                                                                         "narbonne avenue")
     survey_list["Street / Block Name"] = survey_list["Street / Block Name"].str.replace("cumberland road, cadishead",
                                                                                         "cumberland avenue, cadishead")
+    survey_list["Street / Block Name"] = survey_list["Street / Block Name"].str.replace("aston field drive",
+                                                                                        "ashton field drive")
+    survey_list["Street / Block Name"] = survey_list["Street / Block Name"].str.replace("wedgewood road",
+                                                                                        "wedgwood road")
+    survey_list["Street / Block Name"] = survey_list["Street / Block Name"].str.replace("hamilton close",
+                                                                                        "hamilton avenue")
+    survey_list["Street / Block Name"] = survey_list["Street / Block Name"].str.replace("lichens crescent, fitton hill",
+                                                                                        "lichens crescent")
+    survey_list["Street / Block Name"] = survey_list["Street / Block Name"].str.replace("south croft, fitton hill",
+                                                                                        "south croft")
     # Replacement for clively avenue 66-68
     survey_list["NO."] = np.where(
         survey_list["NO."] == "66-68",
@@ -168,7 +178,7 @@ def load_data():
         # df = df[df["Postcode"].str.lower().str.contains(row["Post Code"].lower())]
         df = df[df["Address"].str.lower().str.contains(str(house_number))]
         if df.shape[0] != 1:
-            df = df[df["HouseNo"] == str(row["NO."])]
+            df = df[df["HouseNo"] == str(house_number)]
             if df.shape[0] != 1:
                 df = df[df["Postcode"].str.lower().str.contains(row["Post Code"].lower())]
                 if df.shape[0] != 1: