bug fixes in routing