Fixing search query being lost on going back