added more quickOptions
Merge branch 'quickOptions2'