Addition of Query Test Page, other minor fixes