Improve wiki_query