Readd generic_sh encoder
Switch generic_sh's rank to ManualRanking