new unfiled approach
XPath like logic was changed
Merge commit '358cc7c3d80e2534eff21782978ae0701d2d99d0' into engagepoint/develop