changing correlating URI calculation and disambiguation logic