Include data source as part of index path.
Implement overloads on listen! to support specific query, add test.