Bug Fixes: enrolment, assignment and search order