diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php
index 346fb6a8..72ad3fa3 100644
--- a/web/template/pkg_comment_form.php
+++ b/web/template/pkg_comment_form.php
@@ -50,14 +50,14 @@ if (isset($_REQUEST['comment'])) {
 	# Prompt visitor for comment
 ?>
 <div class="pgbox">
-	<form action='<?php echo $_SERVER['PHP_SELF'] . '?ID=' . $_REQUEST['ID'] ?>' method='post'>
+	<form action='<?php echo $_SERVER['REQUEST_URI'] ?>' method='post'>
 	<div style="padding: 1%">
 <?php
 if (isset($_REQUEST['comment'])) {
 	echo '<b>' . __('Comment has been added.') . '</b>';
 }
 ?>
-	<input type='hidden' name='ID' value="<?php echo $_REQUEST['ID'] ?>" />
+	<input type='hidden' name='ID' value="<?php echo intval($_REQUEST['ID']) ?>" />
 	<?php echo __('Enter your comment below.') ?><br />
 	<textarea name='comment' cols='80' rows='10' style="width: 100%"></textarea><br />
 	<input type='submit' value="<?php echo __("Submit") ?>" />
diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php
index 8e64e11a..aed9ca8b 100644
--- a/web/template/pkg_comments.php
+++ b/web/template/pkg_comments.php
@@ -39,7 +39,7 @@ while (list($indx, $carr) = each($comments)) { ?>
 $count = package_comments_count($_GET['ID']);
 if ($count > 10 && !isset($_GET['comments'])) {
 	echo '<div class="pgbox">';
-	echo '<a href="'. $_SERVER['PHP_SELF'] . '?ID=' . $_REQUEST['ID'] . '&comments=all">'. __('Show all %s comments', $count) . '</a>';
+	echo '<a href="'. $_SERVER['REQUEST_URI'] . '&comments=all">'. __('Show all %s comments', $count) . '</a>';
 	echo '</div>';
 }
 ?>