diff --git a/templates/parks/partials/location_widget.html b/templates/parks/partials/location_widget.html
index d9b432ef..df4ca8e9 100644
--- a/templates/parks/partials/location_widget.html
+++ b/templates/parks/partials/location_widget.html
@@ -223,7 +223,13 @@ document.addEventListener('DOMContentLoaded', function() {
                              data-result-index="${index}">
                             <div class="font-medium text-gray-900 dark:text-white">${result.display_name || result.name || ''}</div>
                             <div class="text-sm text-gray-500 dark:text-gray-400">
-                                ${(result.address && result.address.city) ? result.address.city + ', ' : ''}${(result.address && result.address.country) || ''}
+                                ${[
+                                    result.street,
+                                    result.city || (result.address && (result.address.city || result.address.town || result.address.village)),
+                                    result.state || (result.address && (result.address.state || result.address.region)),
+                                    result.country || (result.address && result.address.country),
+                                    result.postal_code || (result.address && result.address.postcode)
+                                ].filter(Boolean).join(', ')}
                             </div>
                         </div>
                     `).join('');
@@ -313,12 +319,12 @@ document.addEventListener('DOMContentLoaded', function() {
             const address = {
                 name: result.display_name || result.name || '',
                 address: {
-                    house_number: result.address ? result.address.house_number : '',
-                    road: result.address ? (result.address.road || result.address.street) : '',
-                    city: result.address ? (result.address.city || result.address.town || result.address.village) : '',
-                    state: result.address ? (result.address.state || result.address.region) : '',
-                    country: result.address ? result.address.country : '',
-                    postcode: result.address ? result.address.postcode : ''
+                    house_number: result.house_number || (result.address && result.address.house_number) || '',
+                    road: result.street || (result.address && (result.address.road || result.address.street)) || '',
+                    city: result.city || (result.address && (result.address.city || result.address.town || result.address.village)) || '',
+                    state: result.state || (result.address && (result.address.state || result.address.region)) || '',
+                    country: result.country || (result.address && result.address.country) || '',
+                    postcode: result.postal_code || (result.address && result.address.postcode) || ''
                 }
             };