Moved metadata-tag-setting of shopkeeper entities slightly somewhere
else.