Uncommented indexer cleanup, removed UTF8 bug from TODO