The fourth column in mercenary towns.

Keep the first two columns with equivalent alternative creatures as the main ones, and use the third column for other units related to the faction. After all, the first column becomes useless after 20 minutes. No one uses it. Everyone uses the alternatives they like. Then everything that was planned can be implemented.