improved defaults for query