Fix to select scenario on find