To me it is perfectly logical that the UN or international community at lest says that a non religious group be formed to expect aid. This is not to limit religious freedom but to try to separate info from being so easily manipulated or used. Allowing for more responsibility to be directly put on leader ship or the religious extremist for relaying information that proved to be manipulated.
It would be the first thing I would suggest actually…
May not solve all the problems but laying it out clearly like this makes it known that this was a large contributing factor before so steps to mitigate it should be first up for future.