Use underscore-query from npmjs and fix require of underscore-query