Follow-up fixfor  bug# 10558 - Slow CI search for classes with a large maxCount on a value and sub values.