Changed the way query terms are output. Also shows the number of query terms and displays the original query string rather than the rewritten string.