Are you talking about your home country? Have you already left the country or still living there? "Should we wait until safety is restored in the home country, demanding improvement of public order from the government, or flee away?" If it`s your home country and you have already left I would say. "Should we wait until safety is restored in our home country before returning? It is demanding improvement of public order from the government. Or if you are still living there and want to flee, say. "Should we flee until safety is restored in our home country, which is demanding improvement of public order from the government.