The name part in the location string results in zero results

Currently, the module parses the location field to a string, for clients like Google to search on.
It glues the name, street, postal code, etc together to form a string like 'LimoenGroen,Ruijterkade%20142,Amsterdam,nl,1011AC.

This string is then send to for example Google to find a location. However, the name part in the beginning of the string makes that Google cannot find a location. Compare for example: https://maps.googleapis.com/maps/api/geocode/json?address=LimoenGroen,Ru... with https://maps.googleapis.com/maps/api/geocode/json?address=Ruijterkade%20... (LimoenGroen is our company name).