When I get focus on a Worker because he "needs orders", I often pop into the nearest city screen to see what tiles are being worked that need improving. But when I click "Return to Map" the focus always shifts to the next unit that needs orders. Wouldn't this be better if the focus stayed on the same unit?