Sonically sort by type instead of deprecated IDs