Move JS from query form template into js/query-form.js
Remove extra <table> around select fields