New options and style
Make option for filtering work