bug fix pack usage in Query class