DEVSUPPORT-1109 - remove termidentifier if it is empty and remove location type