Fix access to the org based on headers