0.5.42 hotfix branch: Ranger favored enemy and terrain

Game version 0.5.42 hotfix branch

Marsh halfling Ranger Level 6 favored selection has several oddities/bugs:

At level 1 I selected undead. Now I am offered to select undead again at level 6 for no benefit. I select fiend. I reload save to level again confirm this bug and I see no undead or fiends in selection list.

I select desert as favored terrain and after leveling up character screen shows swamp as second selection of favored terrain. Now I actually have to swamps as lineage gives it also. Same after trying again.