Added query view and controller