Closes #2200 - Fixes pre-mature saves to the state which updates the url and breaks the back button from Discover
Merge pull request #2222 from simianhacker/fix-2200

Closes #2200 - Fixes pre-mature saves to the state which updates the url...