bug fix Query class
implements 5.6 Countable updates