only replace template tag in primary name function if value is not null, re #1325
only replace template tag in primary name function if value is not null, re #1325

cvast/arches,cvast/arches,cvast/arches,archesproject/arches,archesproject/arches,cvast/arches,archesproject/arches,archesproject/arches