Changed the query builder service scope to prototype