simplify/fix the xmlhash usage