Department and name AD search were moved to different classes