Improve behaviour regarding the search in browser