Added secondary index searching