Adding exports and fixing query.js.