PLAT-3919 fix for %20 to space.