Corrected content models to be repeating OR groups