improving draft option and making filtering work
implemented draft-selected-option(s)