fix org lookups