Refactor select helper and remove eval #4802

Merged
merged 2 commits into from Jan 31, 2012