Bring department output controller in line with peoplefinder

Eventually I hope to consolidate the two frontends
Ensure XML address components are escaped properly in XML output