Control group goto location with reloading helicopters incorrect

When I have a control group (1) consisting only out of helicopters and I A-move them into a army for attacking, and half of the helicopters are out of ammo they automatically return to the helipads for reloading.

When the first half is at the helipads, the other half is where the attacking took place. When I double tap the 1 key for going to the control group 1 location. The screen goes to the middle of the reloading helicopters and the actual helicopters. Meaning the location where the screen jumps to, there is not a single unit of that control group onscreen which was confusing at first.

Now I can image that when you have a control group it is logically you have the units close by. But in case of reload-required units (Heli's, Aircraft), this really is annoying during (intense) gameplay. And at least it is unexpected behavior, I do not really have a solution. But ideally the units that are reloading should not be used to determine the goto screen position.

This happened on the current release 20190314, but is also the case in the recent devtest-20190810.

I reproduced it in the image below taken using the devtest 20190810

Reproduce the control-group double-tap behavior with helicopters that are split between attacking and helipad reloading, using the versions described in the issue. Trace the control-group goto-location handling and determine how reloading units affect the chosen position; done means the view centers on active group units rather than reloading helicopters.