NEWSOURCE-184 fixes

NAMEISPI tags added for proper names