Fix default_enter_cb
Cleanup history_next API