Hopefully fixing bad xpath-query context creation