fixed uri query creation
bug fixing