added missing fields to adset and adgroup, removed adset fields from adgroup