Updated selectors to get some more complex/weird cases