Updates on query validation