More GPRS matches and modified OXM_ sorting.