Add search highlights and some minor issues