PUll request for: #1539 fix for wrong redirection from search bar on some pages