Refactored SelectQueryProviders Map