Fix #190
some cleanup of the search popover