[BUG] Rollback encodeURI on field.name