US #21 Widget Engine - Refactor engine in order to remove particular cases for selects