refactored query form
removed load labels