fixed various highlighting behavior