Fixing url encoding