changed to generic query service and added checkbox/submit