Improve localization routing