"Attack-Move" command mechanic improvement

Could the Attack-Move command be altered so that A: The movement portion of the command still happen when clicking on an enemy (right now that part is null with a target), B: You maintain your target as you use the command (right now if you use the command it drops your target, so another is chosen at what appears to be random), or C: Both?