Fixed issue where a previously selected scenario would remain active on switching features