Change QueryServer -> QueryUtil, update dependency to 2.3