various fixes to utilize xpath