Updated and tested selectors (except key locator)