Better uri canonicalization