Fix count with where