CMS-2602 Use EntityQuery to do content search / facets

Fixed test