several improves in main selector area
Merge pull request #1784 from diegosarmentero/master

several improves in main selector area