Improve wizard querying of dungeon