remove redundant search terms
consolidated indexing logic