11b743ecd9
* Remove serviceMap feature flag * Remove import * Add serviceMap to queryTypeOptions
* Remove serviceMap feature flag * Remove import * Add serviceMap to queryTypeOptions