removed decodeURIComponent escape