OPAL-2222 - modified existing variabes search services to include facets along the query.