Fix quotations for option selector
Merge