Fix to copy all mappings, encodeURIComponent for setDate