Fix map.json url routing and minor cleanup