Fix bugs with maps field