index 216aca2..56d8e3a 100644
--- maestro_tasks.class.php
+++ maestro_tasks.class.php
@@ -573,14 +573,10 @@ class MaestroTaskTypeManualWeb extends MaestroTask {
 
     $prop=unserialize($this->_properties->task_data);
     $url = $prop['handler'];
-    $url=str_replace('[site_url]',$base_url,$url);
+    $url=str_replace('[site_url]', $base_url,$url);
+    $url=str_replace('[queue_id]', $this->_properties->queue_id, $url);
+    $url=str_replace('[process_id]', $this->_properties->process_id, $url);
 
-    if(strpos($url, "?")) {
-      $url .= "&queueid=" . $this->_properties->queue_id;
-    }
-    else {
-      $url .= "?queueid=" . $this->_properties->queue_id;
-    }
     return $url;
   }