AIRIOS-69 Some bugs related to loading content