Fix edit variant scenario to avoid to rely on flash message
Fix variant delete scenario to avoid to rely on flash message