fixed URL Routing to support 404 pages