Revert removal of filterOptions