diff --git a/system/expressionengine/third_party/mx_google_map/mod.mx_google_map.php b/system/expressionengine/third_party/mx_google_map/mod.mx_google_map.php
index b510576..7e77bb6 100644
--- a/system/expressionengine/third_party/mx_google_map/mod.mx_google_map.php
+++ b/system/expressionengine/third_party/mx_google_map/mod.mx_google_map.php
@@ -398,7 +398,7 @@ function js() {
 
     function GetLatLong( $query, $mode ) {
 
-        $query = str_replace( " ", "+", trim( $query ) );
+        $query = urlencode(trim($query));
         $xml_url = "http://maps.googleapis.com/maps/api/geocode/xml?address=".$query."&ie=utf-8&oe=utf-8&sensor=false";
 
         if ( !$out = $this->_readCache( md5( $query ) ) ) {