--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -4,11 +4,9 @@
 
 $basePath = "";
 if (strstr($_SERVER['PHP_SELF'], "alaveteli/")
-        || strstr($_SERVER['PHP_SELF'], "myway/")
+        || strstr($_SERVER['PHP_SELF'], "admin/")
         || strstr($_SERVER['PHP_SELF'], "lib/")
-        || strstr($_SERVER['PHP_SELF'], "geo/")
-        || strstr($_SERVER['PHP_SELF'], "include/")
-        || strstr($_SERVER['PHP_SELF'], "servicealerts/"))
+        || strstr($_SERVER['PHP_SELF'], "include/"))
     $basePath = "../";
 
 include_once ('couchdb.inc.php');
@@ -49,7 +47,7 @@
     return trim(str_replace("Department of", "", str_replace("Department of the", "Department of", $deptName)));
 } 
 function phrase_to_tag ($phrase) {
-    return str_replace(" ","_",str_replace(",","",strtolower($phrase)));
+    return str_replace(" ","_",str_replace("'","",str_replace(",","",strtolower($phrase))));
 }
 function GetDomain($url)
 {
@@ -64,7 +62,3 @@
      }
 }
 
-?>
-
-
-