updated to use organization URL and to store organization_url if empty