diff --git a/studialis_webform/studialis_webform.pages.inc b/studialis_webform/studialis_webform.pages.inc
index e4ae92b..f9fd5f4 100644
--- a/studialis_webform/studialis_webform.pages.inc
+++ b/studialis_webform/studialis_webform.pages.inc
@@ -2421,7 +2421,7 @@ function studialis_webform_get_param_by_insert($json, $to_insert)
 	foreach ($to_insert as $k => $value) {
 		if(!in_array($k, $aToExclude)) {
 			if($json == 'application_files') {
-
+				$value = urlencode($value);
 				switch ($k) {
 					case 'prospect_initial_training':
 						$data .= '&application_file[prospect_initial_training_uuid]=' . $value;
@@ -2432,9 +2432,6 @@ function studialis_webform_get_param_by_insert($json, $to_insert)
 					case 'commercial_range_uuid':
 						$data .= '&application_file[marketing_range_uuid]=' . $value;
 						break;
-					case 'commercial_range_uuid':
-						$data .= '&application_file[marketing_range_uuid]=' . $value;
-						break;
 					case 'commercial_curriculum_uuid':
 						$data .= '&application_file[marketing_curriculum_uuid]=' . $value;
 						break;
@@ -2462,20 +2459,20 @@ function studialis_webform_get_param_by_insert($json, $to_insert)
 						if(!is_null($value)) {
 							$data .= '&application_online[' . $k . ']=' . date('Y-m-d', $value);
 						} else {
-							$data .= '&application_online[' . $k . ']=' . $value;
+							$data .= '&application_online[' . $k . ']=' . urlencode($value);
 						}
 						break;
 					case 'date_driving_licence':
 						if(!is_null($value)) {
 							$data .= '&application_online[' . $k . ']=' . date('Y-m-d', $value);
 						} else {
-							$data .= '&application_online[' . $k . ']=' . $value;
+							$data .= '&application_online[' . $k . ']=' . urlencode($value);
 						}
 						break;
 					case 'source_80':
 						break;
 					default:
-						$data .= '&application_online[' . $k . ']=' . $value;
+						$data .= '&application_online[' . $k . ']=' . urlencode($value);
 						break;
 				}