Query replies no longer break everything