MARI-47 MARI-48 updated not to set name when there is no value