Change visibility of prepare criteria (will be move in another object)
Add metric filter and use it in query builder (drop prepare criteria
methods that have been moved)