Fix ordering bug where academy would appear in middle of ac suffixes