Better support for pageNotFound Routing