Extended QS options Rework (2/2)