Several fixes about indexing and other bugs#242

BillHuang2001 merged 2 commits intomainEMI-Group/evox:mainfrom

dev-index-fixEMI-Group/evox:dev-index-fixCopy head branch name to clipboard