Add return all keys semantics for query