New query now has a having statement to check for count.