Improve usability of search screen #124