#460 - user-entity (revised) + #447-student discipline (search-fixed)