Reverting
Revert "Improved select"

This reverts commit 355740724c68bafbd554e9cbdc6e4f0963940e1d.
Reverted back to the previous version