changed XmlDataSource to use XPath from current, instead of Attributes on current for both the Key and Label data