Bug 98707. Query.cgi rewrite, reformatting and templatisation. Patch by me, layout by mpt and others, r=justdave,matty. Wahey!