1 files changed, 2 insertions, 3 deletions

diff --git a/buildmaster/build-list.php b/buildmaster/build-list.php
index f915788..11ccb59 100644
--- a/buildmaster/build-list.php
+++ b/buildmaster/build-list.php
@@ -63,12 +63,11 @@ foreach ( $multi_select_search_criteria as $criterium ) {
   if (isset($_GET[$criterium["name"]])) {
     $filter .= " AND " . $criterium["query_pre"];
     foreach ($criterium["values"] as $value)
-      if (strpos("&" . $_SERVER["QUERY_STRING"] . "&", "&" . $criterium["name"] . "=" . $value . "&") !== false)
+      if (strpos("&" . $_SERVER["QUERY_STRING"] . "&", "&" . $criterium["name"] . "=" . urlencode($value) . "&") !== false)
         $filter .= $criterium["query_in_pre"] . $value . $criterium["query_in_post"];
     $filter .= $criterium["query_post"];
   }
 }
-
 $single_select_search_criteria = array(
   "broken" => array(
     "name" => "broken",
@@ -436,7 +435,7 @@ foreach ($multi_select_search_criteria as $criterium) {
   print "              <select multiple=\"multiple\" id=\"id_" . $criterium["name"] . "\" name=\"" . $criterium["name"] . "\">\n";
   foreach ($criterium["values"] as $value) {
     print "                <option value=\"" . $value . "\"";
-    if (strpos( "&" . $_SERVER["QUERY_STRING"] . "&", "&" . $criterium["name"] . "=" . $value . "&") !== false)
+    if (strpos( "&" . $_SERVER["QUERY_STRING"] . "&", "&" . $criterium["name"] . "=" . urlencode($value) . "&") !== false)
       print " selected=\"selected\"";
     print ">" . $value . "</option>\n";
   }