updated for search highlighting