should we try and make a copy of the query here to make this safer, as we do with arrays and maps?