diff --git a/das/das.go b/das/das.go
index fdd390d..3c8728e 100644
--- a/das/das.go
+++ b/das/das.go
@@ -643,9 +643,6 @@ func ProcessLogic(dasquery dasql.DASQuery, maps []mongo.DASRecord, selectedServi
 				if urn == "rules4dataset" || urn == "rules4block" || urn == "rules4file" {
 					// adjust rest URL
 					furl = fmt.Sprintf("%s/rules", furl)
-					if strings.Contains(furl, "#") {
-						furl = strings.Replace(furl, "#", "%23", -1)
-					}
 				}
 			} else {
 				furl = FormRESTUrl(dasquery, dmap)
@@ -653,6 +650,10 @@ func ProcessLogic(dasquery dasql.DASQuery, maps []mongo.DASRecord, selectedServi
 		} else {
 			furl = FormUrlCall(dasquery, dmap)
 		}
+		// adjust url with pound sign
+		if strings.Contains(furl, "#") {
+			furl = strings.Replace(furl, "#", "%23", -1)
+		}
 		if furl == "local_api" && !dasmaps.MapInList(dmap, localApis) {
 			localApis = append(localApis, dmap)
 		} else if furl != "" {