Fixed affiliation data

Closes bug 1211362

Change-Id: Ia8df3663766782b16006778db0a8ddc8d3d4ba64