Add commentaries to index-search and add security in index-remove.