Updated highlight to only color searchable fields