Use selector in more places.