Make indicator collections optionally filter