PIM-2492: Change behavior for Options filter