PIM-2492: Make option filter empty work
PIM-2492: Clean OptionFilter class