PIM-2492: Implements simple option filter on empty value