Fixed mapping upeople companies: if identifier to be mapped is '' don't use.