Made changes to a few things.  Changed name for several items and fixed query page.