Tidy up WT_Query_Name
Update comments