Peroformance improvements to url remapping