BD-49. Fix for FieldCountQuery and FieldCountRangeQuery