Added OR support for COUNT queries