Improved place name parsing