Updated some XPath queries for Associations.