diff --git a/src/Controller/RunController.php b/src/Controller/RunController.php
index 6c58c72ba..de0a81953 100644
--- a/src/Controller/RunController.php
+++ b/src/Controller/RunController.php
@@ -37,7 +37,7 @@ public function index(Request $request, Response $response): void
         $response->headers->set('Cache-Control', 'public, max-age=0');
 
         $search = [];
-        $keys = ['date_start', 'date_end', 'url'];
+        $keys = ['date_start', 'date_end', 'server_name', 'url'];
         foreach ($keys as $key) {
             if ($request->get($key)) {
                 $search[$key] = $request->get($key);
@@ -203,7 +203,7 @@ public function url(Request $request): void
         ];
 
         $search = [];
-        $keys = ['date_start', 'date_end', 'limit', 'limit_custom'];
+        $keys = ['date_start', 'date_end', 'limit', 'limit_custom', 'server_name'];
         foreach ($keys as $key) {
             $search[$key] = $request->get($key);
         }
@@ -262,7 +262,8 @@ public function compare(Request $request): void
             ];
             $candidates = $this->searcher->getForUrl(
                 $baseRun->getMeta('simple_url'),
-                $pagination
+                $pagination,
+                ['server_name' => $baseRun->getMeta('SERVER.SERVER_NAME')]
             );
 
             $paging = [
diff --git a/src/Db/Mapper.php b/src/Db/Mapper.php
index e681d42c7..511cfe4ed 100644
--- a/src/Db/Mapper.php
+++ b/src/Db/Mapper.php
@@ -46,6 +46,9 @@ private function buildConditions(array $search): array
         if (!empty($search['date_end']) && !$hasLimit) {
             $conditions['meta.request_date']['$lte'] = (string)$search['date_end'];
         }
+        if (!empty($search['server_name'])) {
+            $conditions['meta.SERVER.SERVER_NAME'] = (string)$search['server_name'];
+        }
         if (isset($search['simple_url'])) {
             $conditions['meta.simple_url'] = (string)$search['simple_url'];
         }
diff --git a/templates/runs/compare.twig b/templates/runs/compare.twig
index 7cbe9cf7e..29d160801 100644
--- a/templates/runs/compare.twig
+++ b/templates/runs/compare.twig
@@ -2,11 +2,11 @@
 {% import 'macros/helpers.twig' as helpers %}
 
 {% block title %}
-- Compare - {{ base_run.meta.simple_url }}
+- Compare - {{ base_run.meta.SERVER.SERVER_NAME }}{{ base_run.meta.simple_url }}
 {% endblock %}
 
 {% block content %}
-<h1>Compare runs for {{ base_run.meta.simple_url }}</h1>
+<h1>Compare runs for {{ base_run.meta.SERVER.SERVER_NAME }}{{ base_run.meta.simple_url }}</h1>
 
 {% if not base_run %}
 <div class="row-fluid row-spaced">
diff --git a/templates/runs/list.twig b/templates/runs/list.twig
index 0a7b9160f..90e763988 100644
--- a/templates/runs/list.twig
+++ b/templates/runs/list.twig
@@ -28,6 +28,10 @@
             </div>
         </div>
         <div class="control-group span4">
+            <label class="control-label" for="server-name">Server Name</label>
+            <div class="controls">
+                <input type="text" id="server-name" name="server_name" value="{{ search.server_name }}">
+            </div>
             <label class="control-label" for="url">URL</label>
             <div class="controls">
                 <input type="text" id="url" name="url" value="{{ search.url }}">
diff --git a/templates/runs/paginated-list.twig b/templates/runs/paginated-list.twig
index 17a69ba93..7397d2459 100644
--- a/templates/runs/paginated-list.twig
+++ b/templates/runs/paginated-list.twig
@@ -7,6 +7,9 @@
                 {% if show_compare_link %}
                 <th>&nbsp;</th>
                 {% endif %}
+                <th>
+                  Server Name
+                </th>
                 <th>
                   Method
                 </th>
@@ -49,18 +52,22 @@
                 </a>
             </td>
             {% endif %}
+            <td>
+              <a href="{{ url('home', {'server_name': result.meta('SERVER.SERVER_NAME')}) }}">
+                {{result.meta('SERVER.SERVER_NAME')}}
+              </a>
+            </td>
             <td>
               <a href="{{ url('run.view', {'id': result.id|trim }) }}">
                 {{result.meta('SERVER.REQUEST_METHOD')}}
               </a>
             </td>
             <td>
-                {% set addr = result.meta('SERVER.SERVER_NAME') ~ result.meta.url %}
                 {{ helpers.tip_link(
-                    addr,
+                    result.meta.url,
                     50,
                     'url.view',
-                    {'url': result.meta.simple_url}
+                    {'server_name': result.meta('SERVER.SERVER_NAME'), 'url': result.meta.simple_url}
                 ) }}
             </td>
             <td>
diff --git a/templates/runs/url.twig b/templates/runs/url.twig
index b643ba9f3..36b2368eb 100644
--- a/templates/runs/url.twig
+++ b/templates/runs/url.twig
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block content %}
-<h1>Runs for {{ url }} (simplified)</h1>
+<h1>Runs for {{ search.server_name }}{{ url }} (simplified)</h1>
 
 <div class="row-fluid">
     <div id="time-line-graph" class="chart-container span6"></div>
@@ -19,6 +19,7 @@
     </a>
 
     <form action="{{ url('url.view') }}" method="get" class="row hide search-form form-inline">
+        <input type="hidden" name="server_name" value="{{ search.server_name }}" />
         <input type="hidden" name="url" value="{{ search.url }}" />
         <a href="#" class="search-collapse close" title="Hide search form">&times;</a>
         <div class="control-group span4">
diff --git a/templates/runs/view.twig b/templates/runs/view.twig
index df07aeda5..2344c0c9e 100644
--- a/templates/runs/view.twig
+++ b/templates/runs/view.twig
@@ -7,7 +7,7 @@
 
 {% block content %}
 <div class="row-fluid">
-    <h1>Profile data for {{ result.meta('SERVER.REQUEST_METHOD')}} {{ result.meta.url }}</h1>
+    <h1>Profile data for {{ result.meta('SERVER.REQUEST_METHOD')}} {{ result.meta.SERVER.SERVER_NAME }}{{ result.meta.url }}</h1>
 </div>
 <div class="row-fluid">
 <div class="span3">
diff --git a/templates/waterfall/list.twig b/templates/waterfall/list.twig
index 8d73585c1..f85ad33e9 100644
--- a/templates/waterfall/list.twig
+++ b/templates/waterfall/list.twig
@@ -59,6 +59,9 @@
                 {% if show_compare_link %}
                 <th>&nbsp;</th>
                 {% endif %}
+                <th>
+                  Server Name
+                </th>
                 <th>
                   Method
                 </th>
@@ -98,18 +101,22 @@
                 </a>
             </td>
             {% endif %}
+            <td>
+              <a href="{{ url('home', {'server_name': result.meta('SERVER.SERVER_NAME')}) }}">
+                {{result.meta('SERVER.SERVER_NAME')}}
+              </a>
+            </td>
             <td>
               <a href="{{ url('run.view', {'id': result.id|trim }) }}">
                 {{result.meta('SERVER.REQUEST_METHOD')}}
               </a>
             </td>
             <td>
-                {% set addr = result.meta('SERVER.SERVER_NAME') ~ result.meta.url %}
                 {{ helpers.tip_link(
-                    addr,
+                    result.meta.url,
                     50,
                     'url.view',
-                    {'url': result.meta.url}
+                    {'server_name': result.meta('SERVER.SERVER_NAME'), 'url': result.meta.url}
                 ) }}
             </td>
             <td><a href="{{ url('run.view', {'id': result.id|trim }) }}">{{ result.date|date(date_format) }}</a></td>