diff --git a/main/gradebook/exercise_jump.php b/main/gradebook/exercise_jump.php
index 009f2fef21..5036390c31 100755
--- a/main/gradebook/exercise_jump.php
+++ b/main/gradebook/exercise_jump.php
@@ -26,13 +26,15 @@ $doExerciseUrl = '';
 if ($type == LINK_HOTPOTATOES) {
     $exerciseId = $_GET['exerciseId'];
     $path = Security::remove_XSS($_GET['path']);
-    $doExerciseUrl = api_get_path(WEB_CODE_PATH).'exercise/showinframes.php?'.http_build_query([
-        'session_id' => $session_id,
-        'cidReq' => Security::remove_XSS($cidReq),
-        'file' => $path,
-        'cid' => api_get_course_id(),
-        'uid' => api_get_user_id(),
-    ]);
+    $doExerciseUrl = api_get_path(WEB_CODE_PATH).'exercise/showinframes.php?'.http_build_query(
+        [
+            'session_id' => $session_id,
+            'cidReq' => Security::remove_XSS($cidReq),
+            'file' => $path,
+            'cid' => api_get_course_id(),
+            'uid' => api_get_user_id(),
+        ]
+    );
     header('Location: '.$doExerciseUrl);
     exit;
 }
@@ -41,9 +43,10 @@ if (!empty($doExerciseUrl)) {
     header('Location: '.$doExerciseUrl);
     exit;
 } else {
-    $url = api_get_path(WEB_CODE_PATH).'exercise/overview.php?session_id='.$session_id.'&cidReq='.Security::remove_XSS($cidReq);
+    $url = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'
+        .http_build_query(['session_id' => $session_id, 'cidReq' => $cidReq]);
     if (isset($_GET['gradebook'])) {
-        $url .= '&gradebook=view&exerciseId='.intval($_GET['exerciseId']);
+        $url .= '&gradebook=view&exerciseId='.((int) $_GET['exerciseId']);
 
         // Check if exercise is inserted inside a LP, if that's the case
         $exerciseId = $_GET['exerciseId'];
@@ -57,7 +60,14 @@ if (!empty($doExerciseUrl)) {
                         // If the exercise was added once redirect to the LP
                         $firstLp = current($exercise->lpList);
                         if (isset($firstLp['lp_id'])) {
-                            $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&lp_id='.$firstLp['lp_id'].'&action=view&isStudentView=true';
+                            $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&'
+                                .http_build_query(
+                                    [
+                                        'lp_id' => $firstLp['lp_id'],
+                                        'action' => 'view',
+                                        'isStudentView' => 'true',
+                                    ]
+                                );
                         }
                     } else {
                         // If the exercise was added multiple times show the LP list
@@ -65,15 +75,17 @@ if (!empty($doExerciseUrl)) {
                     }
                 }
             } else {
-                $url = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.http_build_query([
-                    'session_id' => $session_id,
-                    'cidReq' => $cidReq,
-                    'gradebook' => $gradebook,
-                    'origin' => '',
-                    'learnpath_id' => '',
-                    'learnpath_item_id' => '',
-                    'exerciseId' => (int) $_GET['exerciseId'],
-                ]);
+                $url = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.http_build_query(
+                    [
+                        'session_id' => $session_id,
+                        'cidReq' => $cidReq,
+                        'gradebook' => $gradebook,
+                        'origin' => '',
+                        'learnpath_id' => '',
+                        'learnpath_item_id' => '',
+                        'exerciseId' => (int) $_GET['exerciseId'],
+                    ]
+                );
             }
         }
     }
diff --git a/main/gradebook/lib/be/exerciselink.class.php b/main/gradebook/lib/be/exerciselink.class.php
index 5388fea26a..4a510f0403 100755
--- a/main/gradebook/lib/be/exerciselink.class.php
+++ b/main/gradebook/lib/be/exerciselink.class.php
@@ -387,7 +387,17 @@ class ExerciseLink extends AbstractLink
         $exerciseId = $data['id'];
         $path = isset($data['path']) ? $data['path'] : '';
 
-        $url = api_get_path(WEB_CODE_PATH).'gradebook/exercise_jump.php?path='.$path.'&session_id='.$sessionId.'&cidReq='.$this->get_course_code().'&gradebook=view&exerciseId='.$exerciseId.'&type='.$this->get_type();
+        $url = api_get_path(WEB_CODE_PATH).'gradebook/exercise_jump.php?'
+            .http_build_query(
+                [
+                    'path' => $path,
+                    'session_id' => $sessionId,
+                    'cidReq' => $this->get_course_code(),
+                    'gradebook' => 'view',
+                    'exerciseId' => $exerciseId,
+                    'type' => $this->get_type(),
+                ]
+            );
 
         return $url;
     }