fixed selected_provider issues