Quick fixes to support new saved variants display