Fixed subject/name/namePart and updated none options to be blank