Fixes to excerpt/search highlighting