Reverts GetByQuery and MNTP Xpath query WIP - is contained only in 7.1