Restore more specific selectors for easier site integration from previous pull request