In long term, yes this needs to be fixed. However, this time, the voluteers kept most of the stuff low profile. As of now, I am not aware of any non-profit organization like this. Maybe this is something that can be done after this debate settles down.