Lots of work on continous query