diff --git a/scrape.py b/scrape.py
index 10c519d97269fd4b772a636676395a0b754dc3f8..1b145775edcd38b29a280e5db1f89192d0ceee72 100644
--- a/scrape.py
+++ b/scrape.py
@@ -15,11 +15,14 @@ def scrape(results_url):
         event_urls = results_tree.xpath(
             '//div[@id="schedule"]/table/tr/td/a[text()="View"]/@href')
     except IndexError:
-        return "No event schedule found"
-    tournament_name = results_tree.xpath(
-        '//span[@class="tournName"]/text()')[0]
-    tournament_details = results_tree.xpath(
-        '//span[@class="tournDetails"]/text()')[0]
+        return "No event schedule found."
+    try:
+        tournament_name = results_tree.xpath(
+            '//span[@class="tournName"]/text()')[0]
+        tournament_details = results_tree.xpath(
+            '//span[@class="tournDetails"]/text()')[0]
+    except IndexError:
+        return "Tournament info not found."
     events = []
     for event_url in event_urls:
         if not urlparse(event_url).netloc:
diff --git a/templates/index.html b/templates/index.html
index 5e8386c7efa92e918130a8406bc0dda77d8a15eb..4853d48e8a6171391b36594405ce6616c1b97860 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,7 +10,7 @@
         <p>
             <form action="{{ url_for('live') }}" method="get">
                 <label>Live Results URL: &nbsp;
-                    <select name="results_url">
+                    <select name="results_url" onchange="this.form.submit()">
                         <option value="" selected disabled>-- Select One --</option>
                         <optgroup label="Escrime Management">
                             <option value="http://escrimeresults.com/tournaments/NCAA.html">NCAA</option>
diff --git a/templates/live.html b/templates/live.html
index f124ee6a9a7480ae79520f6421b73f7c750ecede..e04a1d06c45c499ac743ce8b92cf0db421d9716f 100644
--- a/templates/live.html
+++ b/templates/live.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block extra_head %}
-    <meta http-equiv="refresh" content="60; URL={{ url_for('live') }}">
+    <meta http-equiv="refresh" content="60; URL={{ request.url }}">
 {% endblock extra_head %}
 {% block content %}
     <header>