Player civ selection

In PYDT Game Setup
Can the “Only allow random Civ selection:” checkbox change to allow something like these options.
Can be random or pick a Leader
Must be random
Must pick a leader

Players selecting civ
Also, in the civ selection popup, please add a search textbox for instant filtering on civ or leader name.

As GM, I would also like to set a player’s leader.

The selected civ should be saved on selection without having to click the change civ button. A player in my game setting up forgot to click the button. I also do the same.