Only list pers that are enabled
Fix syst sorting