diff --git a/index.html b/index.html
index 494ccfb..6206346 100644
--- a/index.html
+++ b/index.html
@@ -79,10 +79,11 @@ <h1 style="color: red; font-size: 16px">
           <address-autocomplete postcode="SE5 0HU" id="example-autocomplete" initialAddress="75, COBOURG ROAD, LONDON" />
         -->
         <address-autocomplete
-          postcode="SE5 0HU"
+          postcode="NW5 2JT"
           id="example-autocomplete"
           arrowStyle="light"
           labelStyle="static"
+          osProxyEndpoint="https://api.editor.planx.dev/proxy/ordnance-survey"
         />
       </div>
       <div style="margin-bottom: 1em; background-color: white">
@@ -90,6 +91,7 @@ <h1 style="color: red; font-size: 16px">
           id="example-geocode-autocomplete"
           arrowStyle="light"
           labelStyle="static"
+          osProxyEndpoint="https://api.editor.planx.dev/proxy/ordnance-survey"
         />
       </div>
     </div>
diff --git a/src/components/address-autocomplete/index.ts b/src/components/address-autocomplete/index.ts
index 76b16ef..6550ea6 100644
--- a/src/components/address-autocomplete/index.ts
+++ b/src/components/address-autocomplete/index.ts
@@ -161,6 +161,21 @@ export class AddressAutocomplete extends LitElement {
                 // filter out "ALTERNATIVE", "HISTORIC", and "PROVISIONAL" records
                 address.LPI.LPI_LOGICAL_STATUS_CODE_DESCRIPTION === "APPROVED",
             )
+            .sort((a: Address, b: Address) => {
+              // addresses are currently in OS Places default order (API does not support sorting directly)
+              //  - the default order separates parent properties from flats and orders addresses like 1, 10..., 2 etc
+              //  - we want to first sort street numbers like 1, 2 ... 10, then ensure flats appear beside their parent shells in the list of options
+              const collator = new Intl.Collator([], { numeric: true });
+              if (a.LPI?.PAO_START_NUMBER && b.LPI?.PAO_START_NUMBER) {
+                collator.compare(
+                  a.LPI.PAO_START_NUMBER,
+                  b.LPI.PAO_START_NUMBER,
+                );
+              }
+              if (a.LPI?.SAO_TEXT && b.LPI?.SAO_TEXT) {
+                collator.compare(a.LPI.SAO_TEXT, b.LPI.SAO_TEXT);
+              }
+            })
             .map((address: Address) => {
               // omit the council name and postcode from the display name
               this._options.push(
@@ -172,9 +187,6 @@ export class AddressAutocomplete extends LitElement {
                 ),
               );
             });
-
-          const collator = new Intl.Collator([], { numeric: true });
-          this._options.sort((a, b) => collator.compare(a, b));
         }
 
         // fetch next page of results if they exist