Refactorization and improvement of the manual indexing features