|#620| adding ID to rnr fields