Fixed bugs coming from the URI/Literal substitution