#7020: Use field name for location filters instead of hard-coded 'location' value