Fixed issue with encoded uri