Fix broken language selection

All services (CR, DME and GS) are affected by this issue