PIM-2492: Change behavior of OptionFilter ORM