fixed indentation in queryBuilder.js
Finally refactored the services!