selector improvement, working on label catalog also