improved routing for client moves