DDF-621 - fixed nested xpath queries