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

... and breaks the back button from Discover