Updates on queries and validation