Make search a little more robust, display current search above current search results