move more logic to get_field_query