Add workarounds for queue querying in main process
3 files changed