now we have better handling for complex uri