Adding optionsFiltered event
Merge branch 'filter-options-event' into dev