Fix #5 produce clean and simple selectors