Simplify config selection choicebox feature

With less changes compared to the orriginal code as it was before