Optimized selection for performance
Fixed few bugs
Bug: enum/list will not submit value not text