Updated stubpage to handle URLs better