add location as a general event attribute
remove country_of_manufacture from the attr set for events