Fixed provider selection (only active providers) (REF-218)