Fix the support for wuclass fetch. We use a flag to decide the type of the wuclasses.