Adds support to filter by topic