Update URI templates to reserved expansion (+)