diff --git a/platypush/plugins/google/maps.py b/platypush/plugins/google/maps.py
index 84511d52c..55eb7f5f1 100644
--- a/platypush/plugins/google/maps.py
+++ b/platypush/plugins/google/maps.py
@@ -35,14 +35,18 @@ class GoogleMapsPlugin(GooglePlugin):
                     if component_type == 'street_number':
                         address['street_number'] = addr_component['long_name']
                     elif component_type == 'route':
-                        address['street'] = addr_component['long_name']
+                        address['address'] = addr_component['long_name']
                     elif component_type == 'locality':
                         address['locality'] = addr_component['long_name']
                     elif component_type == 'country':
-                        address['country'] = addr_component['short_name']
+                        address['country'] = addr_component['short_name'].lower()
                     elif component_type == 'postal_code':
                         address['postal_code'] = addr_component['long_name']
 
+            if 'address' in address and 'street_number' in address:
+                address['address'] += ' ' + address['street_number']
+                del(address['street_number'])
+
         return Response(output=address)