Improve handling of required counts in preview.