impr(fix-selector): merge selectors

Check for xpath support and pick the right selector