PFS-933 #comment resolve fixed with organization/name sorting