Fixed subject/name/namePart and updated none options to be blank
Merge pull request #25 from matthewperry/7.x-METRO-71

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