[#1416] csv update public bodies

Mostly minor tweaks made during the investigation of #1416. 

Could not arrive at a sensible fix without developing #1415.