If there was an attempt to fix units that are locked on a target from disengaging that lock, I think it's actually worse now. I have units locked on a target, and when the unit they are locked on routs, my unit starts chasing them all over the battlefield like a dog chasing a car. I have to stop them and usually by the time i see it, they are in big trouble.