diff --git a/app/templates/packages/list.html b/app/templates/packages/list.html
index cd7f7d9..5242018 100644
--- a/app/templates/packages/list.html
+++ b/app/templates/packages/list.html
@@ -6,6 +6,7 @@
 
 {% block content %}
 	<form method="get" action="">
+		{% if type %}<input type="hidden" name="type" value="{{ type }}" />{% endif %}
 		<input type="text" name="q" value="{{ query or ''}}" />
 		<input type="submit" value="Search" />
 	</form>
@@ -26,7 +27,7 @@
 	</div>
 	<ul>
 		{% for t in tags %}
-			<li><a href="{{ url_for('packages_page', q=(query or '')+' tag:'+t.name) }}">
+			<li><a href="{{ url_for('packages_page', q=(query or '')+' tag:'+t.name, type=type) }}">
 				{{ t.title }}
 			</a></li>
 		{% else %}
diff --git a/app/views/packages.py b/app/views/packages.py
index d1bf20e..d9f0717 100644
--- a/app/views/packages.py
+++ b/app/views/packages.py
@@ -31,7 +31,7 @@ def doPackageList(type):
 		return jsonify([package.getAsDictionary(app.config["BASE_URL"]) for package in query.all()])
 	else:
 		tags = Tag.query.all()
-		return render_template("packages/list.html", title=title, packages=query.all(), query=search, tags=tags)
+		return render_template("packages/list.html", title=title, packages=query.all(), query=search, tags=tags, type=None if type is None else type.toName())
 
 
 @app.route("/packages/")