Modified location_type page
Modified map-canvas