#322 Extracted more selectors