Refactor single select
0.3.1