query enhancements