Make ThemePresenter.populateIndicators support a filter clause