history in the controller and administrator fixes