PIM-1611 Fix the case with empty attribute options