Move predictive count for default value out of filter-authors

The prediction is now done in prepare-predictive-filters,
which fixes the count: the previous count did not take into
account authors without any specific value matching the given
multiplicity for a criterion, but matching for the default value,
i.e. using any value for the criterion.
Merge branch 'enhancements'