Fixes for QuickVariant not working on shipMain page