Cleanup and fixed url mapping