Fixed DwQueryHelper