Shock infantry selection

I hope i’m in the right place for suggestions to devs ;).

I wonder if I’m the only one that finds that issue really annoying… when you use the find all cavalry hotkey it also selects all shock infantry units and reduce the movement speed of all the cavs because of one shock infantry units for example a disciple for china. I could use the same example for explorers in India which are considered as cavalry.

Would it be possible that in a future patche we could have an hotkey to find all shock infantry and have them in a different selection category. It would also be really cool if we could have the same done with all explorers and have them in a different category selection.