Add support for spaces and special characters in location