UShankhadev Cleanup and url encoding