Refactoring of async query handles
2 files changed