fix issues introduced with routing