more RecodeUris refactoring