revert
addl indexing and some refactoring
more indexes and refactoring
rank indexes for contexts
rank indexes for contexts
polishing tnrs for autocomplete box
fixing merge issues for moved files