Added escaping to location names.