Adding 'filter' and 'indexName' options