Filter by collection

https://clever.atlassian.net/browse/DATA-334
nit: remove