Add facet back to count query for search form