diff --git a/video_metadata/templates/file_listing/index.html b/video_metadata/templates/file_listing/index.html
index 02f0632..ec9f806 100644
--- a/video_metadata/templates/file_listing/index.html
+++ b/video_metadata/templates/file_listing/index.html
@@ -8,19 +8,25 @@
 	<ul>
 	{% for path in paths recursive %}
 		<li>
-		{% if path.is_dir %}
-			<span>{{ path.base_name }}</span>
-		{% else %}
-		<form action="{{ url_for('tmdb.query_movie') }}" method="post">
-			<span>{{ path.base_name }}</span>
-			<input type="hidden" name="base_name" value="{{ path.base_name }}" />
-			<input type="hidden" name="rel_path" value="{{ path.rel_path }}" />
-			<input class="arrow_submit" type="submit" value="->" />
-		</form>
-		{% endif %}
-		{% if path.contents %}
-			<ul>{{ loop(path.contents) }}</ul>
-		{% endif %}
+			{% if path.is_dir %}
+				<span>{{ path.base_name }}</span>
+			{% else %}
+			{#
+			<form action="{{ url_for('tmdb.query_movie') }}" method="post">
+				<span>{{ path.base_name }}</span>
+				<input type="hidden" name="base_name" value="{{ path.base_name }}" />
+				<input type="hidden" name="rel_path" value="{{ path.rel_path }}" />
+				<input class="arrow_submit" type="submit" value="->" />
+			</form>
+			#}
+				<a href="{{ url_for('tmdb.query_movie')
+					}}?query={{ path.base_name
+					}}&rel_path={{ path.rel_path }}">{{ 
+						path.base_name }}</a>
+			{% endif %}
+			{% if path.contents %}
+				<ul>{{ loop(path.contents) }}</ul>
+			{% endif %}
 		</li>
 	{% endfor %}
 	</ul>
diff --git a/video_metadata/views/tmdb.py b/video_metadata/views/tmdb.py
index ccf86fb..0303315 100644
--- a/video_metadata/views/tmdb.py
+++ b/video_metadata/views/tmdb.py
@@ -51,6 +51,7 @@ class query_data(object):
         self.query_params = {}
         self.query_type = query_type.UNKNOWN
         self.raw_query_str = ''
+        self.rel_path = ''
         self.tmdb_api_key = ''
 
 class response_data(object):
@@ -86,12 +87,13 @@ def query_movie():
     query.tmdb_api_key = current_app.config['TMDB_API_KEY']
 
     # NOTE: query string can be submitted from a link or form input
-    if 'base_name' in request.form:
-        query.raw_query_str = request.form['base_name']
-    elif 'query' in request.form:
+    #   form input comes from the query.html template and the links
+    #   come from the file_listing/index.html template
+    if 'query' in request.form:
         query.raw_query_str = request.form['query']
-    elif 'query' in request.args:
+    elif 'query' in request.args and 'rel_path' in request.args:
         query.raw_query_str = request.args['query']
+        query.rel_path = request.args['rel_path']
 
     if query.raw_query_str and parseQueryStr(query):
         if isQueryCached(query.parsed_query_str):