cleanup comment indicies
use prefix matching with search