some edits to url mapping