First pass fixups on query page.