CLC-4540 - Resolve issue with existing section filtering