fixed issues with routing