OQueryModel should count more correctly in case of expand()