major commit: added query form