Fix to pass form_state value to unit result form