Fixes of history api