Always extract query into form_fields