TRUNK-4425 Preferred name matches should be sorted above synonym matches