EAGLESIX-2994: Fixed null match in elementPath. Includes updates from other matchers