Add namespace support to xpath
Finalize xpath