untested: update to wiquery 6