Fix/history back and forward