Added fields to form_state to allow filtering