Add query highlighting in the search result. Also templates slightly hairdressed.