Revision for User - Entity link + fixes for student discipline basic index search