Merge pull request #542 from nsendetzky/master

Fixes catalog search filter hint and improves browser back button handling