bugfixes on routes refactoring, some minor fixes