Added query form and title