Fix history
Fix project change bug
Merge pull request #356 from SAPlayer/history-fixes

Fix history