Include risk.id in ID column