Improve status facet by using form fields instead of a quick hack