Added support for filters and indexing.