remove trailing spaces
Make select attribute option "add" support quotes