Several cosmetic and user interface fixes to the way we search #1909