MapFetcher queuing refactoring