diff --git a/nextjs-app/components/HomeView.tsx b/nextjs-app/components/HomeView.tsx
index 8d0793b..7dc39b3 100644
--- a/nextjs-app/components/HomeView.tsx
+++ b/nextjs-app/components/HomeView.tsx
@@ -317,7 +317,7 @@ function CompactSchoolItem({ school, onAddToCompare, isInCompare }: CompactSchoo
     <div className={styles.compactItem}>
       <div className={styles.compactItemContent}>
         <div className={styles.compactItemHeader}>
-          <a href={{schoolUrl(school.urn, school.school_name)}} className={styles.compactItemName}>
+          <a href={schoolUrl(school.urn, school.school_name)} className={styles.compactItemName}>
             {school.school_name}
           </a>
           {school.distance !== undefined && school.distance !== null && (
@@ -353,7 +353,7 @@ function CompactSchoolItem({ school, onAddToCompare, isInCompare }: CompactSchoo
         >
           {isInCompare ? '✓ Comparing' : '+ Compare'}
         </button>
-        <a href={{schoolUrl(school.urn, school.school_name)}} className="btn btn-tertiary btn-sm">
+        <a href={schoolUrl(school.urn, school.school_name)} className="btn btn-tertiary btn-sm">
           View
         </a>
       </div>
diff --git a/nextjs-app/components/RankingsView.tsx b/nextjs-app/components/RankingsView.tsx
index 14ee612..59c481a 100644
--- a/nextjs-app/components/RankingsView.tsx
+++ b/nextjs-app/components/RankingsView.tsx
@@ -267,7 +267,7 @@ export function RankingsView({
                         )}
                       </td>
                       <td className={styles.schoolCell}>
-                        <a href={{schoolUrl(ranking.urn, ranking.school_name)}} className={styles.schoolLink}>
+                        <a href={schoolUrl(ranking.urn, ranking.school_name)} className={styles.schoolLink}>
                           {ranking.school_name}
                         </a>
                       </td>
@@ -277,7 +277,7 @@ export function RankingsView({
                         <strong>{displayValue}</strong>
                       </td>
                       <td className={styles.actionCell}>
-                        <a href={{schoolUrl(ranking.urn, ranking.school_name)}} className="btn btn-tertiary btn-sm">View</a>
+                        <a href={schoolUrl(ranking.urn, ranking.school_name)} className="btn btn-tertiary btn-sm">View</a>
                         <button
                           onClick={() => handleAddToCompare(ranking)}
                           disabled={alreadyInComparison}
diff --git a/nextjs-app/components/SchoolCard.tsx b/nextjs-app/components/SchoolCard.tsx
index 9a4ba57..c28b076 100644
--- a/nextjs-app/components/SchoolCard.tsx
+++ b/nextjs-app/components/SchoolCard.tsx
@@ -25,7 +25,7 @@ export function SchoolCard({ school, onAddToCompare, onRemoveFromCompare, showDi
     <div className={`${styles.card} ${isInCompare ? styles.cardInCompare : ''}`}>
       <div className={styles.header}>
         <h3 className={styles.title}>
-          <Link href={{schoolUrl(school.urn, school.school_name)}}>
+          <Link href={schoolUrl(school.urn, school.school_name)}>
             {school.school_name}
           </Link>
         </h3>
@@ -146,7 +146,7 @@ export function SchoolCard({ school, onAddToCompare, onRemoveFromCompare, showDi
       )}
 
       <div className={styles.actions}>
-        <Link href={{schoolUrl(school.urn, school.school_name)}} className="btn btn-primary">
+        <Link href={schoolUrl(school.urn, school.school_name)} className="btn btn-primary">
           View Details
         </Link>
         {onAddToCompare && (
diff --git a/nextjs-app/components/SchoolRow.tsx b/nextjs-app/components/SchoolRow.tsx
index d6f4103..2e555e0 100644
--- a/nextjs-app/components/SchoolRow.tsx
+++ b/nextjs-app/components/SchoolRow.tsx
@@ -61,7 +61,7 @@ export function SchoolRow({
 
         {/* Line 1: School name + Ofsted badge */}
         <div className={styles.line1}>
-          <a href={{schoolUrl(school.urn, school.school_name)}} className={styles.schoolName}>
+          <a href={schoolUrl(school.urn, school.school_name)} className={styles.schoolName}>
             {school.school_name}
           </a>
           {school.ofsted_grade && (
@@ -155,7 +155,7 @@ export function SchoolRow({
 
       {/* Right: actions, vertically centred */}
       <div className={styles.rowActions}>
-        <a href={{schoolUrl(school.urn, school.school_name)}} className="btn btn-tertiary btn-sm">
+        <a href={schoolUrl(school.urn, school.school_name)} className="btn btn-tertiary btn-sm">
           View
         </a>
         {(onAddToCompare || onRemoveFromCompare) && (
diff --git a/nextjs-app/components/SecondarySchoolRow.tsx b/nextjs-app/components/SecondarySchoolRow.tsx
index 63d369a..ccabda3 100644
--- a/nextjs-app/components/SecondarySchoolRow.tsx
+++ b/nextjs-app/components/SecondarySchoolRow.tsx
@@ -73,7 +73,7 @@ export function SecondarySchoolRow({
 
         {/* Line 1: School name + Ofsted badge */}
         <div className={styles.line1}>
-          <a href={{schoolUrl(school.urn, school.school_name)}} className={styles.schoolName}>
+          <a href={schoolUrl(school.urn, school.school_name)} className={styles.schoolName}>
             {school.school_name}
           </a>
           {school.ofsted_grade && (
@@ -155,7 +155,7 @@ export function SecondarySchoolRow({
 
       {/* Right: actions */}
       <div className={styles.rowActions}>
-        <a href={{schoolUrl(school.urn, school.school_name)}} className="btn btn-tertiary btn-sm">
+        <a href={schoolUrl(school.urn, school.school_name)} className="btn btn-tertiary btn-sm">
           View
         </a>
         {(onAddToCompare || onRemoveFromCompare) && (
diff --git a/nextjs-app/next.config.js b/nextjs-app/next.config.js
index 68fc955..4a84256 100644
--- a/nextjs-app/next.config.js
+++ b/nextjs-app/next.config.js
@@ -16,12 +16,10 @@ const nextConfig = {
 
   // Image optimization
   images: {
-    domains: [
-      'tile.openstreetmap.org',
-      'a.tile.openstreetmap.org',
-      'b.tile.openstreetmap.org',
-      'c.tile.openstreetmap.org',
-      'cdnjs.cloudflare.com',
+    remotePatterns: [
+      { protocol: 'https', hostname: '*.tile.openstreetmap.org' },
+      { protocol: 'https', hostname: 'tile.openstreetmap.org' },
+      { protocol: 'https', hostname: 'cdnjs.cloudflare.com' },
     ],
     formats: ['image/avif', 'image/webp'],
     minimumCacheTTL: 60,