Feature/term highlight