Fixes problem that payment service item could be selected when payment and delivery provider uses the same code