Added more robust selectors for a tags