Enhance JCR query