Shifted the query type condition into setquerytype, so it's no longer stored as a string. Also did some rejigging to get the tabs consistent, and added some comments for a few less obvious areas of code.