SRW/SRU update: use uri instead of code for diagnostic