If you update this you might want to update the count query to be consistent?