diff --git a/common_functions.php b/common_functions.php
index 55b97517130..b17016d1fad 100644
--- a/common_functions.php
+++ b/common_functions.php
@@ -6357,7 +6357,7 @@ function getQuotaInformation($surveyid,$language,$quotaid='all')
                                          'Limit' => $survey_quotas['qlimit'],
                                          'Action' => $survey_quotas['action'],
                                          'Message' => $survey_quotas['quotals_message'],
-                                         'Url' => passthruReplace(insertansReplace($survey_quotas['quotals_url']), $surveyinfo),
+                                         'Url' => templatereplace(passthruReplace($survey_quotas['quotals_url']), $surveyinfo),
                                          'UrlDescrip' => $survey_quotas['quotals_urldescrip'],
                                          'AutoloadUrl' => $survey_quotas['autoload_url']));
             $query = "SELECT * FROM ".db_table_name('quota_members')." WHERE quota_id='{$survey_quotas['id']}'";
diff --git a/group.php b/group.php
index 142a68d4946..296b5b2a920 100644
--- a/group.php
+++ b/group.php
@@ -362,8 +362,8 @@
 
             //Before doing the "templatereplace()" function, check the $thissurvey['url']
             //field for limereplace stuff, and do transformations!
-            $thissurvey['surveyls_url']=templatereplace($thissurvey['surveyls_url']);   // to do INSERTANS substitutions
             $thissurvey['surveyls_url']=passthruReplace($thissurvey['surveyls_url'], $thissurvey);
+            $thissurvey['surveyls_url']=templatereplace($thissurvey['surveyls_url']);   // to do INSERTANS substitutions
 
             $content='';
             $content .= templatereplace(file_get_contents("$thistpl/startpage.pstpl"));
diff --git a/replacements.php b/replacements.php
index d7bd43d3e30..be4ad29cfb5 100644
--- a/replacements.php
+++ b/replacements.php
@@ -669,6 +669,8 @@ function templatereplace($line, $replacements=array(), $anonymized=false, $quest
 	$coreReplacements['NAVIGATOR'] = $navigator;    // global
 	$coreReplacements['NOSURVEYID'] = $surveylist['nosid']; // global
 	$coreReplacements['NUMBEROFQUESTIONS'] = $_totalquestionsAsked;
+    $coreReplacements['PASSTHRULABEL'] = '';
+    $coreReplacements['PASSTHRUVALUE'] = '';
 	$coreReplacements['PERCENTCOMPLETE'] = $percentcomplete;    // global
 	$coreReplacements['PRIVACY'] = $privacy;    // global
 	$coreReplacements['PRIVACYMESSAGE'] = "<span style='font-weight:bold; font-style: italic;'>".$clang->gT("A Note On Privacy")."</span><br />".$clang->gT("This survey is anonymous.")."<br />".$clang->gT("The record kept of your survey responses does not contain any identifying information about you unless a specific question in the survey has asked for this. If you have responded to a survey that used an identifying token to allow you to access the survey, you can rest assured that the identifying token is not kept with your responses. It is managed in a separate database, and will only be updated to indicate that you have (or haven't) completed this survey. There is no way of matching identification tokens with survey responses in this survey.");