Updated portrait selection to take hidden traits into account