Add support for 'location' and 'location_rpt' schema fields