Changing organization to hotosm, fixing broken