Continuous Query enhancements.