diff --git a/CRM/Civicrmpostcodelookup/Page/PostcodeAnywhere.php b/CRM/Civicrmpostcodelookup/Page/PostcodeAnywhere.php
index d05768d..15907bc 100755
--- a/CRM/Civicrmpostcodelookup/Page/PostcodeAnywhere.php
+++ b/CRM/Civicrmpostcodelookup/Page/PostcodeAnywhere.php
@@ -125,18 +125,21 @@ class CRM_Civicrmpostcodelookup_Page_PostcodeAnywhere extends CRM_Civicrmpostcod
                $address = array('id' => $moniker);
                $addressItemRow = (array) $simpleXMLData->Rows;
                $addressItem = (array) $addressItemRow['Row'];
-
-               $addressLineArray[] = $addressItem['@attributes']['Company'];
-               $addressLineArray[] = $addressItem['@attributes']['Line1'];
-               $addressLineArray[] = $addressItem['@attributes']['Line2'];
-               $addressLineArray[] = $addressItem['@attributes']['Line3'];
-               $addressLineArray[] = $addressItem['@attributes']['Line4'];
-               $addressLineArray[] = $addressItem['@attributes']['Line5'];
+               $addressLineArray = [
+                       $addressItem['@attributes']['Company'],
+                       $addressItem['@attributes']['Line1'],
+               ];
                $addressLineArray = array_filter($addressLineArray);
                $address["street_address"] = @implode(', ', $addressLineArray);

-               $address["supplemental_address_1"] = $addressItem['@attributes']['SecondaryStreet'];
-               $address["supplemental_address_2"] = $addressItem['@attributes']['DependentLocality'];
+               $address["supplemental_address_1"] = $addressItem['@attributes']['Line2'];
+               $address["supplemental_address_2"] = $addressItem['@attributes']['Line3'];
+               $addressLineArray = [
+                       $addressItem['@attributes']['line4'],
+                       $addressItem['@attributes']['line5'],
+               ];
+               $addressLineArray = array_filter($addressLineArray);
+               $address["supplemental_address_3"] = @implode(', ', $addressLineArray);

                $address["town"] = $addressItem['@attributes']['PostTown'];