There are also one or more EO's from Nov/Dec '17 Jan '18 that talk about Enemies NOT being limited to those in an theater of war and about those who have Laundered money/provided funding or even transference of funds for Enemy Combatants/Terrorists. Also something about creating an Economic Situation that was so precarious as to constitute an actual Threat To National Security. In one of these EO's there was something about those persons could and would be treated the same as Enemy Combatants and would not be entitled to ALL of the normal Constitutional Rights given to "normal" Criminals. They specifically mentioned WHERE they could be held and specifically mentioned suspending Habeas-Corpus.
I think it was a HUGE mistake to start treating Terrorists like Criminals in the first place. They are not criminals, they are Enemy Combatants.