fixes for route change