Implement issue #3 async query