Correct keys only query handling

Now returns empty entities with set keys.