Pull out extension correctly and add fallback for org_id