Updates for Zones not respected 31061

Fix for TFS/RoutePlanner 31061 "Zones not respected" (softech update)