diff --git a/core/components/wayfinder/wayfinder.class.php b/core/components/wayfinder/wayfinder.class.php
index de6c94f..5a838cd 100644
--- a/core/components/wayfinder/wayfinder.class.php
+++ b/core/components/wayfinder/wayfinder.class.php
@@ -808,7 +808,9 @@ public function get_file_contents($filename) {
     }
 
     public function findTemplateVars($tpl) {
-        preg_match_all('~\[\[\+(.*?)\]\]~', $tpl, $matches);
+	# Intersel - 20190425 -remove [[++settings]] variables from match
+	#preg_match_all('~\[\[\+(.*?)\]\]~', $tpl, $matches);
+	preg_match_all('~\[\[\+([^\+].*?)\]\]~', $tpl, $matches);
         $TVs = array();
         foreach($matches[1] as $tv) {
             if (strpos($tv, "wf.") === false) {