Replaced only option with filter option