fixing admin & history