HQ selection in skirmish

With Jupiter's Forge out I've dived back into OTC and am enjoying it.

One thing I've noticed; since there are now 6 HQs to choose from and the UI only accommodates 4, a selection of 4 out the 6 possible HQ are randomly chosen as viable options to deploy. Is this a specific design decision by the dev team, or is this simply using the UI that was available at the time?

I would love to see this changed so that all six options are available as choices at the start of the match.

Cheers and loving the game once again.