Adding indexing without filtering code