Converting more Wiki.java methods over to QueryTools