Fix bug around everything being queried.