[WPT-57] Refactored generation of location code to ignore the region if ...

...it has a comma separated value. Ex: City Of London, Greater London