Bug fixes, add old spellings for Sukija indexer.