diff --git a/inc/class.schedule.php b/inc/class.schedule.php
--- a/inc/class.schedule.php
+++ b/inc/class.schedule.php
@@ -624,11 +624,11 @@ class Schedule
 	echo "    
 \n";
 
 
@@ -941,18 +941,26 @@ class Schedule
   {
     global $clean_urls;
 
-    $url = '';
-    if (!$clean_urls)
-      $url .= 'process.php?s=';
-
-    $url .= (int)$id;
+    $query = array();
     if ($clean_urls)
-      $url .= '?';
+      $url = (int)$id;
     else
-      $url .= '&';
+      {
+        $url = 'process.php';
+        $query['s'] = (int)$id;
+      }
 
     if ($page)
-      $url .= 'page=' . (int)$page . '&';
+      $query['page'] = (int)$page;
+
+    if (!empty($query))
+      {
+        $query_processed = array();
+        foreach ($query as $key => $value)
+          $query_processed[] = $key . '=' . rawurlencode($value);
+
+        $url .= '?' . implode('&', $query_processed);
+      }
 
     return $url;
   }