Correctly map greaterlondon/greatermanchester to London/Manchester