modify for Select component