fix issues with route watches returning 404 and 500 errors

Fix issues with route watches returning 404 and 500 errors