Please fix broken fully remappable hotkey layout for new civs

Age of Empires IV IV - Report a Bug
1

There is no way to customize hotkeys for Joan in fully custom layout.
In the command card for Joan actions like:
Divine Arrow
Divine Restoration
Consecrate
Riders, Ready!

Those actions are hard-wired to the grid layout grid[1,1], grid[1,2], grid[1,3], grid[1,4] and no customization is possible in fully custom layout. It would be nice to have this customization added as I have to go to the keyboard config file to edit those hotkeys.

2

Also missing Desert Raider hotkeys in fully custom layout:

Ayyubid Desert Raider:

  • Desert Raider Bow
  • Desert Raider Blade

Ayyubid Mangonel (Manjaniq):

  • Swap Weapon (Incendiary)
  • Swap Weapon (Kinetic)
    I have a conflict for attack the ground and swap weapon which I don’t know how to fix without breaking some other unit commands.
3

Zhu Xi Legacy:

  • Missing hotkey customization in Stables to produce Imperial Guard, a new unit which is unlocked in Zhu Xi Library.
4

Still not fixed in the Patch 9.1.370

5

Zhu Xi Legacy. This struck me hard. I have normal hotkeys for Spearman and Early Police Guard until I upgrade Police Guard - now I have the same key for both - because for whatever reason Police Guard for Zhu Xi is ignored and fallback to grid layout whatever is defined there, which I already set for other unit and I cannot change without breaking some other units keys.

This pretty much makes all of the new civs unplayable because of the bug.
Please, fix the FULLY REMAPPABLE HOTKEYS. Thank you.