Improve removal pending bundles retrieval