Queries revisited