changed if v: for if v is not none to skip empty strings