re-add facets to dv basic search, refactor common code