+ Enhance criteria builder logic