several improves in main selector area