Fixes langid/countryid definition, fixes attribute code, removes product links in e-mail template again