At some point in time we are going to have to rethink the "freedom of religion" idea. It only works with peaceful religions. Muslims are going to have to be confined to certain countries and fenced off. Let them kill each other, as they have done for centuries.
More precise definitions are definitely needed. Islam has a religious component and a seditious, political component.
We did a great deal to suppress communism in the US, which was primarily political, but held to with religous fervor by its adherents. No one though of Communism as a religion, but for its adherents it served as one. Lenin and Marx were demigods.
Freedom of religion, rightly understood, pertains to beliefs about the world, conduct, and possibly God that do not affect or dominate others. Once you cross over into political insurrection, you're outside of the area where this should apply as public policy.