Querry mess cleaned