RDS enhancements to develop

also seems to have a tag-along of the s/ID/Id/;