Improve wikiquery to deal with in/out links