The current query should only be cleared if all = true (like in 3.0.4)
#MBL-10557