Fixed bug with Choose Group->Choose Service navigation after switching cities