diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php
index f5163f3b..692c8550 100644
--- a/web/template/pkg_search_form.php
+++ b/web/template/pkg_search_form.php
@@ -21,7 +21,7 @@
 					<li>
 						<label><?php print __("Location"); ?></label>
 						<select name='L'>
-							<option value=0><?php print __("Any"); ?></option>
+							<option value="0"><?php print __("Any"); ?></option>
 							<?php
 							foreach (pkgLocations() as $id => $loc):
 								if (intval($_GET["L"]) == $id):
diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php
index 1ea5928f..a933c014 100644
--- a/web/template/pkg_search_results.php
+++ b/web/template/pkg_search_results.php
@@ -1,4 +1,4 @@
-<form action='packages.php?<?php print $_SERVER['QUERY_STRING'] ?>' method='post'>
+<form action='packages.php?<?php echo htmlentities($_SERVER['QUERY_STRING']) ?>' method='post'>
 <div class="pgbox">
 		<div class="pgboxtitle">
 			<span class='f3'><?php print __("Package Listing") ?></span>