Optimized custom select code
Few little fixes in custom select
Merge remote-tracking branch 'origin/master'