Ability to highlight multiple search terms #5220

Fix Errors