History + Api fix