diff --git a/formwidgets/AddressFinder.php b/formwidgets/AddressFinder.php
index 074ea0f..2d118d4 100644
--- a/formwidgets/AddressFinder.php
+++ b/formwidgets/AddressFinder.php
@@ -1,5 +1,6 @@
 <?php namespace RainLab\Location\FormWidgets;
 
+use Backend\Classes\FormField;
 use Html;
 use Backend\Classes\FormWidgetBase;
 use RainLab\Location\Models\Setting;
@@ -93,4 +94,12 @@ public function loadAssets()
         $this->addJs('//maps.googleapis.com/maps/api/js?libraries=places&key='.$apiKey);
         $this->addJs('js/location-autocomplete.js', 'core');
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSaveValue($value)
+    {
+        return FormField::NO_SAVE_DATA;
+    }
 }
diff --git a/formwidgets/addressfinder/assets/js/location-autocomplete.js b/formwidgets/addressfinder/assets/js/location-autocomplete.js
index 59b0549..30caeca 100644
--- a/formwidgets/addressfinder/assets/js/location-autocomplete.js
+++ b/formwidgets/addressfinder/assets/js/location-autocomplete.js
@@ -96,7 +96,7 @@
                 inputLongitude: 'lng'
             },
             'short': {
-                inputStreet: ['street_number', 'route'],
+                inputStreet: ['route', 'street_number'],
                 inputCity: 'locality',
                 inputZip: 'postal_code',
                 inputState: 'administrative_area_level_1',