Updated the rest of the code now that we changed `getModuleQueryType()` to `getModuleQuery()` (#671)