add_muni modifications for better city support on server