Cool, should I change `Query()` also or just do `QueryAll()` for now?