Simplify facet criteria
Rename criteria building method