Update QuickDialog and related fix