Separated highlighting for different cases (Issue #3)