make tax report queries work correctly with bundled packages, #24412