routing bugfixes