udpated structure of gazetter and map