I don't like either of these options too much, especially because of how vaguely "terrorist" is defined. Perhaps make sure it is legal for people to defend their location and physical property, though, and arrest those who kill or severely and intentionally injure others. Also arrest people for arson. But is a mob shouting at someone in an intimidating way, for example, "terrorism"? Or does just being in a protest where some do bad things count as "terrorism"? Because I do not think that should be a jailable offense.