Issue #86: fixing active enrollments search
Merge branch '3.1.x'