uri parsing fixed