Fix unneeded option wrapping on list, add empty option in list