Adapt donations to use single location field #246

see #246