STI support reindexing and searching

Updated and corrected as suggested in #198