Reworked affix selection functions