Fix XML selectors