fixes in select field
Merge branch 'master' into edge