diff --git a/client/chromez-behaviors.js b/client/chromez-behaviors.js
index 854d1d4..45acb53 100644
--- a/client/chromez-behaviors.js
+++ b/client/chromez-behaviors.js
@@ -16,6 +16,7 @@ ChromeZBehaviors.AJAXBehavior = {
       }
     }
     this.push('searchQueries', {
+      query: clone(query),
       callbacks: [callback],
       params: params,
       key: queryKey,
@@ -28,17 +29,17 @@ ChromeZBehaviors.AJAXBehavior = {
     }
   },
   handleResponse: function(data) {
-    var query = this.searchQueries[data.model.index];
+    var searchQuery = this.searchQueries[data.model.index];
     var result = data.detail.response;
     if (this.onResponse)
-      result = this.onResponse(result);
-    if (query.dataCache && JSON.stringify(query.dataCache) == JSON.stringify(result)) {
+      result = this.onResponse(result, searchQuery.query);
+    if (searchQuery.dataCache && JSON.stringify(searchQuery.dataCache) == JSON.stringify(result)) {
       return;
     }
-    query.dataCache = result;
-    query.element = data.target;
-    for (var i = 0; i < query.callbacks.length; i++)
-      query.callbacks[i](clone(result));
+    searchQuery.dataCache = result;
+    searchQuery.element = data.target;
+    for (var i = 0; i < searchQuery.callbacks.length; i++)
+      searchQuery.callbacks[i](clone(result));
   },
 }
 
diff --git a/client/cz-component-dash.html b/client/cz-component-dash.html
index a0b5c36..bcc6d10 100644
--- a/client/cz-component-dash.html
+++ b/client/cz-component-dash.html
@@ -44,16 +44,16 @@
         text-decoration: none;
       }
     </style>
-    <a href="{{crbugLink(component.name)}}">
-      <paper-card heading="{{component.name}} Issues" id='card'>
+    <a href="{{queryURL(issueList)}}">
+      <paper-card heading="{{key}} Issues" id='card'>
         <div class="card-content">
           <div class='card-flex'>
             <paper-item>
               <paper-item-body two-line>
                 <div>Owned by us</div>
                 <div secondary class='component'>
-                  <template is="dom-repeat" items="{{summary(component.teamsIssueList, updateSLO)}}">
-                    <a href="{{crbugLink(component.name, item.query)}}">
+                  <template is="dom-repeat" items="{{summary(component.team, updateSLO)}}">
+                    <a href="{{queryURL(issueList, item.query)}}">
                       <span class="bubble" style="background-color: {{item.color}}">{{item.level}}</span>
                       <span class="summary">{{item.summary}}</span>
                     </a>
@@ -66,8 +66,8 @@
               <paper-item-body two-line>
                 <div>Owned by others</div>
                 <div secondary class='component'>
-                  <template is="dom-repeat" items="{{summary(component.othersIssueList, updateSLO)}}">
-                    <a href="{{crbugLink(component.name, item.query)}}">
+                  <template is="dom-repeat" items="{{summary(component.others, updateSLO)}}">
+                    <a href="{{queryURL(issueList, item.query)}}">
                       <span class="bubble" style="background-color: {{item.color}}">{{item.level}}</span>
                       <span class="summary">{{item.summary}}</span>
                     </a>
@@ -80,8 +80,8 @@
               <paper-item-body two-line>
                 <div>Unowned</div>
                 <div secondary class='component'>
-                  <template is="dom-repeat" items="{{summary(component.unownedIssueList, updateSLO)}}">
-                    <a href="{{crbugLink(component.name, item.query)}}">
+                  <template is="dom-repeat" items="{{summary(component.unowned, updateSLO)}}">
+                    <a href="{{queryURL(issueList, item.query)}}">
                       <span class="bubble" style="background-color: {{item.color}}">{{item.level}}</span>
                       <span class="summary">{{item.summary}}</span>
                     </a>
@@ -104,57 +104,74 @@
           type: 'Object',
           value: function() { return []; },
         },
-        component: {
+        updateSLO: {
           type: 'Object',
-          value: function() { return {}; },
+          value: function() { return null; },
         },
-        updateSLO: {
+        issueList: {
+          type: 'Object',
+          value: function() { return null; },
+        },
+        component: {
           type: 'Object',
-          value: function() { return {}; },
+          value: function() { return {}; }
         }
       },
 
+      observers: [
+        'updateComponent(issueList)',
+      ],
+
       attached: function() {
-        registerSource('cz-config', 'users', function(users) {
+        registerSource('cz-config', 'users', users => {
           this.set('users', users.map(userData => userData['email']));
-        }.bind(this));
-        registerSource('cz-config', 'components', function(components) {
-          this.set('component', {name: components[this.key]});
-          this.updateComponentIssues(this.component)
-        }.bind(this));
-        registerSource('cz-config', 'updateSLO', function(updateSLO) {
+        });
+        registerSource('cz-config', 'updateSLO', updateSLO => {
           this.set('updateSLO', updateSLO);
-        }.bind(this));
+        });
+        registerSource('cz-config', 'issue-sources', issueSources => {
+          this.updateIssueSource(issueSources[this.key]);
+        });
       },
 
       summary: function(issueList, updateSLO) {
+        if (!issueList || !updateSLO) {
+          return [];
+        }
         return issueList.summary(updateSLO);
       },
 
-      updateComponentIssues: function(component) {
-        registerSource('cz-crbug-issues', {component: component.name}, function(issueList) {
-          var teamsIssueList = new IssueList();
-          var othersIssueList = new IssueList();
-          var unownedIssueList = new IssueList();
+      updateIssueSource: function({tag, query}) {
+        registerSource(tag, query, issueList => {
+          this.set('issueList', issueList);
+        });
+      },
+
+      updateComponent: function(issueList) {
+        var team = new IssueList();
+        var others = new IssueList();
+        var unowned = new IssueList();
+        if (issueList) {
           for (var issue of issueList) {
             if (issue.owner == null) {
-              unownedIssueList.push(issue);
+              unowned.push(issue);
             } else if (this.users.indexOf(issue.owner) === -1) {
-              othersIssueList.push(issue);
+              others.push(issue);
             } else {
-              teamsIssueList.push(issue);
+              team.push(issue);
             }
           }
-          this.set('component.teamsIssueList', teamsIssueList);
-          this.set('component.othersIssueList', othersIssueList);
-          this.set('component.unownedIssueList', unownedIssueList);
-        }.bind(this));
+        }
+        this.set('component.team', team);
+        this.set('component.others', others);
+        this.set('component.unowned', unowned);
       },
 
-      crbugLink: function(component, query) {
-        var componentQuery = clone(query || {});
-        componentQuery.component = component;
-        return Crbug.queryURL(componentQuery);
+      queryURL: function(issueList, subQuery) {
+        if (!issueList) {
+          return '';
+        }
+        return issueList.getQueryURL(subQuery);
       },
     });
   </script>
diff --git a/client/cz-crbug-issues.html b/client/cz-crbug-issues.html
index 514e326..371d2af 100644
--- a/client/cz-crbug-issues.html
+++ b/client/cz-crbug-issues.html
@@ -2,6 +2,7 @@
 <link rel="import" href="../bower_components/iron-ajax/iron-ajax.html">
 <script src="../bower_components/papaparse/papaparse.min.js"></script>
 <script src="chromez-behaviors.js"></script>
+<script src="crbug-lib.js"></script>
 <script src="issues-lib.js"></script>
 
 <dom-module id="cz-crbug-issues">
@@ -24,19 +25,30 @@
       is: "cz-crbug-issues",
       behaviors: [ChromeZBehaviors.AJAXBehavior],
 
-      onResponse: function(data) {
+      onResponse: function(data, query) {
         data = JSON.parse(data);
-        if (data.items == undefined)
-          return [];
-        return new IssueList(data.items.filter(a => a.ID !== "").map(item => {
-          return new Issue({
-            id: item.id,
-            owner: item.owner ? item.owner.name : null,
-            summary: item.summary,
-            lastUpdatedString: item.updated,
-            labels: item.labels,
+        var issues = [];
+        if (data.items) {
+          issues = data.items.filter(a => a.ID !== "").map(item => {
+            return new Issue({
+              id: item.id,
+              owner: item.owner ? item.owner.name : null,
+              summary: item.summary,
+              lastUpdatedString: item.updated,
+              labels: item.labels,
+            });
           });
-        }));
+        }
+
+        function getQueryURL(subQuery) {
+          if (subQuery) {
+            query = clone(query);
+            Object.assign(query, subQuery);
+          }
+          return Crbug.queryURL(query);
+        }
+
+        return new IssueList(issues, getQueryURL);
       },
 
       registerQuery: function(query, callback) {
@@ -45,7 +57,7 @@
           q: Crbug.queryString(query),
         };
         this.addCallbackToQuery(query, callback, params);
-      }
+      },
     });
   </script>
 </dom-module>
diff --git a/client/cz-registry.html b/client/cz-registry.html
index ed08cdc..4c366ca 100644
--- a/client/cz-registry.html
+++ b/client/cz-registry.html
@@ -55,7 +55,10 @@
           }.bind(this));
         }
 
-        return this.registeredSources[type].then(source => source.registerQuery(query, callback));
+        return this.registeredSources[type].then(source => {
+          source.registerQuery(query, callback);
+          return source;
+        });
       },
     });
   </script>
diff --git a/client/issues-lib.js b/client/issues-lib.js
index 8a8ccdd..ee7201e 100644
--- a/client/issues-lib.js
+++ b/client/issues-lib.js
@@ -94,15 +94,20 @@ class Issue {
 }
 
 class IssueList {
-  constructor(issues = []) {
+  constructor(issues = [], getQueryURL = null) {
     for (var issue of issues) {
       console.assert(issue instanceof Issue);
     }
     this._issues = issues;
+    this._getQueryURL = getQueryURL;
+  }
+
+  getQueryURL(subQuery) {
+    return this._getQueryURL(subQuery);
   }
 
   clone() {
-    return new IssueList(this._issues.map(issue => issue.clone()));
+    return new IssueList(this._issues.map(issue => issue.clone()), this._getQueryURL);
   }
 
   push(issue) {
diff --git a/configs/animations-ave.json b/configs/animations-ave.json
index 25e1b9b..ad9c196 100644
--- a/configs/animations-ave.json
+++ b/configs/animations-ave.json
@@ -17,7 +17,7 @@
 },
 "dashes": [
   "cz-clock-dash",
-  "cz-component-dash(animation)",
+  "cz-component-dash(Blink Animations)",
   "cz-issue-priority-dash",
   "cz-regression-dash",
   "cz-review-latency-dash(false)",
@@ -42,5 +42,11 @@
     "repo": "web-animations/web-animations-next",
     "shields": ["travis", "github/issues-pr", "github/issues"]
   }
+},
+"issue-sources": {
+  "Blink Animations": {
+    "tag": "cz-crbug-issues",
+    "query": {"component": "Blink>Animation"}
+  }
 }
 }