Changes to build queries in re-usable chunks in Node model