diff --git a/resources/school_list_2025.tar.gz b/resources/school_list_2025.tar.gz
index e59dbc8705..423b422ddd 100644
Binary files a/resources/school_list_2025.tar.gz and b/resources/school_list_2025.tar.gz differ
diff --git a/src/main/java/uk/ac/cam/cl/dtg/segue/api/Constants.java b/src/main/java/uk/ac/cam/cl/dtg/segue/api/Constants.java
index 5a189ba076..7cc337d1f5 100644
--- a/src/main/java/uk/ac/cam/cl/dtg/segue/api/Constants.java
+++ b/src/main/java/uk/ac/cam/cl/dtg/segue/api/Constants.java
@@ -549,14 +549,15 @@ public enum EventFilterOption {
 
   // School List loading - raw data
   public static final String SCHOOL_URN_FIELDNAME = "urn";
-  public static final String SCHOOL_ESTABLISHMENT_NAME_FIELDNAME = "school_name";
+  public static final String SCHOOL_NAME_FIELDNAME = "school_name";
   public static final String SCHOOL_POSTCODE_FIELDNAME = "postcode";
   public static final String SCHOOL_DATA_SOURCE_FIELDNAME = "data_source";
   public static final String SCHOOL_CLOSED_FIELDNAME = "closed";
 
   // School List loading POJO fields
+  // Note: These are the JSON field names as serialized by Jackson (matches School class field names)
   public static final String SCHOOL_URN_FIELDNAME_POJO = "urn";
-  public static final String SCHOOL_ESTABLISHMENT_NAME_FIELDNAME_POJO = "name";
+  public static final String SCHOOL_NAME_FIELDNAME_POJO = "name";
   public static final String SCHOOL_POSTCODE_FIELDNAME_POJO = "postcode";
 
   // User School Reporting
diff --git a/src/main/java/uk/ac/cam/cl/dtg/segue/dao/schools/SchoolListReader.java b/src/main/java/uk/ac/cam/cl/dtg/segue/dao/schools/SchoolListReader.java
index d52e04ed92..88589b5b17 100644
--- a/src/main/java/uk/ac/cam/cl/dtg/segue/dao/schools/SchoolListReader.java
+++ b/src/main/java/uk/ac/cam/cl/dtg/segue/dao/schools/SchoolListReader.java
@@ -18,7 +18,7 @@
 
 import static uk.ac.cam.cl.dtg.segue.api.Constants.DEFAULT_RESULTS_LIMIT;
 import static uk.ac.cam.cl.dtg.segue.api.Constants.SCHOOLS_INDEX_BASE;
-import static uk.ac.cam.cl.dtg.segue.api.Constants.SCHOOL_ESTABLISHMENT_NAME_FIELDNAME_POJO;
+import static uk.ac.cam.cl.dtg.segue.api.Constants.SCHOOL_NAME_FIELDNAME_POJO;
 import static uk.ac.cam.cl.dtg.segue.api.Constants.SCHOOL_POSTCODE_FIELDNAME_POJO;
 import static uk.ac.cam.cl.dtg.segue.api.Constants.SCHOOL_URN_FIELDNAME;
 import static uk.ac.cam.cl.dtg.segue.api.Constants.SCHOOL_URN_FIELDNAME_POJO;
@@ -98,7 +98,7 @@ public List<School> findSchoolByNameOrPostCode(final String searchQuery)
     List<String> schoolSearchResults = searchProvider.fuzzySearch(
         new BasicSearchParameters(SCHOOLS_INDEX_BASE, SchoolsIndexType.SCHOOL_SEARCH.toString(), 0,
             DEFAULT_RESULTS_LIMIT),
-        searchQuery, null, null, SCHOOL_URN_FIELDNAME_POJO, SCHOOL_ESTABLISHMENT_NAME_FIELDNAME_POJO,
+        searchQuery, null, null, SCHOOL_URN_FIELDNAME_POJO, SCHOOL_NAME_FIELDNAME_POJO,
         SCHOOL_POSTCODE_FIELDNAME_POJO
     ).getResults();
 
diff --git a/src/main/java/uk/ac/cam/cl/dtg/segue/etl/SchoolIndexer.java b/src/main/java/uk/ac/cam/cl/dtg/segue/etl/SchoolIndexer.java
index 85d96ae5ad..3086df70b5 100644
--- a/src/main/java/uk/ac/cam/cl/dtg/segue/etl/SchoolIndexer.java
+++ b/src/main/java/uk/ac/cam/cl/dtg/segue/etl/SchoolIndexer.java
@@ -69,6 +69,14 @@ synchronized void indexSchoolsWithSearchProvider() throws UnableToIndexSchoolsEx
     }
 
     log.info("Creating schools index with search provider.");
+    // Clear the existing school index to remove any old/corrupted entries
+    boolean cleared = es.expungeIndexFromSearchCache(SCHOOLS_INDEX_BASE, SchoolsIndexType.SCHOOL_SEARCH.toString());
+    if (cleared) {
+      log.info("Cleared existing school index before reindexing.");
+    } else {
+      log.info("School index did not exist or could not be cleared (this is OK for first-time indexing).");
+    }
+    
     List<School> schoolList = this.loadAndBuildSchoolList();
     List<Map.Entry<String, String>> indexList = Lists.newArrayList();
     ObjectMapper objectMapper = mapperUtils.getSharedContentObjectMapper();
@@ -138,10 +146,9 @@ private synchronized List<School> loadAndBuildSchoolList() throws UnableToIndexS
               .valueOf(schoolArray[fieldNameMapping.get(Constants.SCHOOL_DATA_SOURCE_FIELDNAME)]);
 
           School schoolToSave = new School(schoolArray[fieldNameMapping.get(Constants.SCHOOL_URN_FIELDNAME)],
-              schoolArray[fieldNameMapping.get(Constants.SCHOOL_ESTABLISHMENT_NAME_FIELDNAME)],
+              schoolArray[fieldNameMapping.get(Constants.SCHOOL_NAME_FIELDNAME)],
               schoolArray[fieldNameMapping.get(Constants.SCHOOL_POSTCODE_FIELDNAME)],
-              // CSV file contains string "t" and "f" values to denote true and false, but need a boolean:
-              "t".equals(schoolArray[fieldNameMapping.get(Constants.SCHOOL_CLOSED_FIELDNAME)]),
+              Boolean.valueOf(schoolArray[fieldNameMapping.get(Constants.SCHOOL_CLOSED_FIELDNAME)]),
               source);
 
           if (null == schoolToSave.getPostcode() || schoolToSave.getPostcode().isEmpty()) {
@@ -153,6 +160,14 @@ private synchronized List<School> loadAndBuildSchoolList() throws UnableToIndexS
           // This happens when the school does not have the required data
           log.warn("Unable to load the following school into the school list due to missing required fields. {}",
               Arrays.toString(schoolArray));
+        } catch (IllegalArgumentException e) {
+          // This happens when data_source field is missing, empty, or has an invalid value
+          log.warn("Unable to load the following school into the school list due to invalid data_source value. "
+                  + "URN: {}, Error: {}, Row: {}",
+              schoolArray.length > fieldNameMapping.get(Constants.SCHOOL_URN_FIELDNAME) 
+                  ? schoolArray[fieldNameMapping.get(Constants.SCHOOL_URN_FIELDNAME)] : "unknown",
+              e.getMessage(),
+              Arrays.toString(schoolArray));
         }
       }
     } catch (FileNotFoundException e) {