diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 63c24244e..dc273cb6a 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -5424,7 +5424,7 @@ class SurveyAdminAjax {
 			// Dodamo nice url za anketo
 			$f = @fopen($site_path.'.htaccess', 'a');
 			if ($f !== false) {
-				fwrite($f, "\nRewriteRule ^".$nice_url.'\b(.*)			'.$link."&foo=\$1&%{QUERY_STRING}");
+				fwrite($f, "\nRewriteRule ^".$nice_url.'\b(?!-)(.*)			'.$link."&foo=\$1&%{QUERY_STRING}");
 				
 				// Dodamo nice url v bazo
 				$s = sisplet_query("INSERT INTO srv_nice_links (id,ank_id,link) VALUES ('','$this->anketa','$nice_url')");
@@ -5450,7 +5450,7 @@ class SurveyAdminAjax {
 							$link_skupina = $link.'&'.$skupina_string.'='.$rowS['id'];
 									
 							// Skupini dodamo nice url zapis v htaccess
-							fwrite($f, "\nRewriteRule ^".$nice_url_skupina.'\b(.*)			'.$link_skupina."&foo=\$1&%{QUERY_STRING}");
+							fwrite($f, "\nRewriteRule ^".$nice_url_skupina.'\b(?!-)(.*)			'.$link_skupina."&foo=\$1&%{QUERY_STRING}");
 									
 							// Skupini zapisemo nice url se v bazo
 							$sqlSI = sisplet_query("INSERT INTO srv_nice_links_skupine 
@@ -5490,7 +5490,7 @@ class SurveyAdminAjax {
 			$output = array();
 			while (!feof($f)) {
 				$r = fgets($f);
-				if (strpos($r, "^".$nice_url.'\b(.*)	') !== false && strpos($r, "?anketa=".$anketa."") !== false) {
+				if (strpos($r, "^".$nice_url.'\b') !== false && strpos($r, "?anketa=".$anketa."") !== false) {
 					// kao pobrisemo vrstico
 				} else {
 					$output[] = $r;
@@ -5528,7 +5528,7 @@ class SurveyAdminAjax {
 							$sqlS = sisplet_query("SELECT * FROM srv_nice_links_skupine WHERE ank_id='$anketa' AND nice_link_id='$nice_url_id'");
 							while($rowS = mysqli_fetch_array($sqlS)){
 								
-								if (strpos($r, "^".$rowS['link'].'\b(.*)	') !== false && strpos($r, "?anketa=".$anketa."&".$skupina_string."=".$rowS['vre_id']."") !== false) {
+								if (strpos($r, "^".$rowS['link'].'\b') !== false && strpos($r, "?anketa=".$anketa."&".$skupina_string."=".$rowS['vre_id']."") !== false) {
 									// pobrisemo vrstico in vnos v bazi
 									$sqlD = sisplet_query("DELETE FROM srv_nice_links_skupine WHERE ank_id='$anketa' AND nice_link_id='$row[id]' AND vre_id='$rowS[vre_id]'");
 									$delete = true;
diff --git a/admin/survey/api/class.ApiSurvey.php b/admin/survey/api/class.ApiSurvey.php
index e8484ff20..511c0b69c 100644
--- a/admin/survey/api/class.ApiSurvey.php
+++ b/admin/survey/api/class.ApiSurvey.php
@@ -3531,7 +3531,7 @@ class ApiSurvey {
                 if ($add) {
                     $f = @fopen($site_path . '.htaccess', 'a');
                     if ($f !== false) {
-                        fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(.*)			' . $link . "&foo=\$1&%{QUERY_STRING}");
+                        fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(?!-)(.*)			' . $link . "&foo=\$1&%{QUERY_STRING}");
                         fclose($f);
 
                         $sqlI = sisplet_query("INSERT INTO srv_nice_links_skupine (id,ank_id,nice_link_id,vre_id,link) VALUES ('','$ank_id','$row[id]','$vre_id','$nice_url')");
@@ -3638,7 +3638,7 @@ class ApiSurvey {
                 if ($add) {
                     $f = @fopen($site_path . '.htaccess', 'a');
                     if ($f !== false) {
-                        fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(.*)			' . $link . "&foo=\$1&%{QUERY_STRING}");
+                        fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(?!-)(.*)			' . $link . "&foo=\$1&%{QUERY_STRING}");
                         fclose($f);
 
                         $sqlI = sisplet_query("INSERT INTO srv_nice_links_skupine (id,ank_id,nice_link_id,vre_id,link) VALUES ('','$ank_id','$row[id]','$vre_id','$nice_url')");
diff --git a/admin/survey/classes/class.Common.php b/admin/survey/classes/class.Common.php
index 081365687..1236203af 100644
--- a/admin/survey/classes/class.Common.php
+++ b/admin/survey/classes/class.Common.php
@@ -1112,7 +1112,7 @@ class Common {
 			while (!feof($f)) {
 				$r = fgets($f);
 
-				if (strpos($r, "^".$nice_url.'\b(.*)	') !== false && strpos($r, "?anketa=".$ank_id."") !== false) {
+				if (strpos($r, "^".$nice_url.'\b') !== false && strpos($r, "?anketa=".$ank_id."") !== false) {
 					// kao pobrisemo vrstico
 				} else {
 					$output[] = $r;
@@ -1152,7 +1152,7 @@ class Common {
 
 							while($rowS = mysqli_fetch_array($sqlS)){
 
-								if (strpos($r, "^".$rowS['link'].'\b(.*)	') !== false && strpos($r, "?anketa=".$ank_id."&skupina=".$rowS['vre_id']."") !== false) {
+								if (strpos($r, "^".$rowS['link'].'\b') !== false && strpos($r, "?anketa=".$ank_id."&skupina=".$rowS['vre_id']."") !== false) {
 
 									// pobrisemo vrstico in vnos v bazi
 									$sqlD = sisplet_query("DELETE FROM srv_nice_links_skupine WHERE ank_id='$ank_id' AND nice_link_id='$row[id]' AND vre_id='$rowS[vre_id]'");
diff --git a/admin/survey/classes/class.SurveySkupine.php b/admin/survey/classes/class.SurveySkupine.php
index 566004ba9..b5132f5b7 100644
--- a/admin/survey/classes/class.SurveySkupine.php
+++ b/admin/survey/classes/class.SurveySkupine.php
@@ -309,7 +309,7 @@ class SurveySkupine {
                     if ($add) {		
                         $f = @fopen($site_path.'.htaccess', 'a');
                         if ($f !== false) {
-                            fwrite($f, "\nRewriteRule ^".$nice_url.'\b(.*)			'.$link."&foo=\$1&%{QUERY_STRING}");
+                            fwrite($f, "\nRewriteRule ^".$nice_url.'\b(?!-)(.*)			'.$link."&foo=\$1&%{QUERY_STRING}");
                             fclose($f);
                             
                             $sqlI = sisplet_query("INSERT INTO srv_nice_links_skupine (id,ank_id,nice_link_id,vre_id,link) VALUES ('','$this->anketa','$row[id]','$vre_id','$nice_url')");
@@ -384,7 +384,7 @@ class SurveySkupine {
 					$output = array();
 					while (!feof($f)) {
 						$r = fgets($f);
-						if (strpos($r, "^".$nice_url.'\b(.*)	') !== false && strpos($r, "?anketa=".$anketa."&".$skupina_string."=".$vre_id."") !== false) {
+						if (strpos($r, "^".$nice_url.'\b') !== false && strpos($r, "?anketa=".$anketa."&".$skupina_string."=".$vre_id."") !== false) {
 							// kao pobrisemo vrstico in vnos v bazi
 							$sqlD = sisplet_query("DELETE FROM srv_nice_links_skupine WHERE ank_id='$anketa' AND nice_link_id='$row[id]' AND vre_id='$vre_id'");
 						} 
diff --git a/admin/survey/modules/mod_EVOLI/class.EvoliForm.php b/admin/survey/modules/mod_EVOLI/class.EvoliForm.php
index 631814071..517787cec 100644
--- a/admin/survey/modules/mod_EVOLI/class.EvoliForm.php
+++ b/admin/survey/modules/mod_EVOLI/class.EvoliForm.php
@@ -830,7 +830,7 @@ class EvoliForm {
 				if ($add) {		
 					$f = @fopen($site_path.'.htaccess', 'a');
 					if ($f !== false) {
-						fwrite($f, "\nRewriteRule ^".$nice_url.'\b(.*)			'.$link."&foo=\$1&%{QUERY_STRING}");
+						fwrite($f, "\nRewriteRule ^".$nice_url.'\b(?!-)(.*)			'.$link."&foo=\$1&%{QUERY_STRING}");
 						fclose($f);
 						
 						$sqlI = sisplet_query("INSERT INTO srv_nice_links_skupine (id,ank_id,nice_link_id,vre_id,link) VALUES ('','$ank_id','$row[id]','$vre_id','$nice_url')");