Removed dependency to wiquery.