Fix empty value list handling