diff --git a/html/pages/bills.inc.php b/html/pages/bills.inc.php
index ae54227d9a..ef69e3738a 100644
--- a/html/pages/bills.inc.php
+++ b/html/pages/bills.inc.php
@@ -45,12 +45,12 @@ $pagetitle[] = "Billing";
 
 echo("<meta http-equiv='refresh' content='10000'>");
 
-if ($_GET['opta'] == "history")
+if ($vars['view'] == "history")
 {
   include("pages/bills/search.inc.php");
   include("pages/bills/pmonth.inc.php");
 }
-elseif ($_GET['opta'] == "add")
+elseif ($vars['view'] == "add")
 {
   if (is_numeric($vars['port']))
   {
diff --git a/html/pages/bills/search.inc.php b/html/pages/bills/search.inc.php
index 67432a5dd7..d2e073b467 100644
--- a/html/pages/bills/search.inc.php
+++ b/html/pages/bills/search.inc.php
@@ -37,18 +37,19 @@
              <td width='170' style='font-weight:bold; font-size: 12px;'>
 <?php
 
-  if ($_GET['opta'] == "history")
+  if ($vars['view'] == "history")
   {
     echo('<a href="bills/"><img src="images/16/clock.png" align=absmiddle alt="Current Billing Period"> Current Billing Period</a>');
   } else
   {
-    echo('<a href="bills/history/"><img src="images/16/clock_red.png" align=absmiddle alt="Previous Billing Period"> Previous Billing Period</a>');
+    // FIXME - generate_url
+    echo('<a href="bills/view=history/"><img src="images/16/clock_red.png" align=absmiddle alt="Previous Billing Period"> Previous Billing Period</a>');
   }
 
 ?>
              </td>
              <td width='80' style='font-weight:bold; font-size: 12px;'>
-                                                   <a href='bills/add/'><img src="images/16/add.png" align=absmiddle alt="Add"> Add Bill</a>
+                                                   <a href='bills/view=add/'><img src="images/16/add.png" align=absmiddle alt="Add"> Add Bill</a>
              </td>
            </tr>
   </form>