diff --git a/contrib/tag_history/main.php b/contrib/tag_history/main.php
index a0f29081..1be0546c 100644
--- a/contrib/tag_history/main.php
+++ b/contrib/tag_history/main.php
@@ -67,7 +67,7 @@ class Tag_History extends Extension {
 			}
 		}
 		else if($event->page_matches("tag_history/all")) {
-			$page_id = int_escape($event->get_arg(1));
+			$page_id = int_escape($event->get_arg(0));
 			$this->theme->display_global_page($page, $this->get_global_tag_history($page_id), $page_id);
 		}
 		else if($event->page_matches("tag_history") && $event->count_args() == 1) {
diff --git a/contrib/tag_history/theme.php b/contrib/tag_history/theme.php
index de8ed164..7387d6d9 100644
--- a/contrib/tag_history/theme.php
+++ b/contrib/tag_history/theme.php
@@ -86,15 +86,13 @@ class Tag_HistoryTheme extends Themelet {
 		$history_html = $start_string . $history_list . $end_string;
 		$page->set_title("Global Tag History");
 		$page->set_heading("Global Tag History");
-		$page->add_block(new NavBlock());
 		$page->add_block(new Block("Tag History", $history_html, "main", 10));
 
 
 		$h_prev = ($page_number <= 1) ? "Prev" :
-			'<a href="'.make_link('comment/list/'.$prev).'">Prev</a>';
+			'<a href="'.make_link('tag_history/all/'.($page_number-1)).'">Prev</a>';
 		$h_index = "<a href='".make_link()."'>Index</a>";
-		$h_next = ($page_number >= $total_pages) ? "Next" :
-			'<a href="'.make_link('comment/list/'.$next).'">Next</a>';
+		$h_next = '<a href="'.make_link('tag_history/all/'.($page_number+1)).'">Next</a>';
 
 		$nav = $h_prev.' | '.$h_index.' | '.$h_next;
 		$page->add_block(new Block("Navigation", $nav, "left"));