improve label position of suburbs and add neighbourhoods