Improved switching between single and multiple providers mode.