bug fixes with continousQueries