Make highlighting stricter