Richard, I accept your first distinction.
The second one was between individuals or members of organisations.
They are different of course, but how should Merah be regarded differently as a loner or as a member of an Islamist/Jihadist group.