diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
index 15013bb91..dddfe43ea 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
@@ -138,6 +138,7 @@
             <div class="col-12">
                 <label for="Description">Description</label>
                 <textarea asp-for="Description" class="form-control"></textarea>
+                <small id="with-hint-info" class="pt-2">Only the first 3,000 characters of the description will be used by search</small>
                 <span asp-validation-for="Description"></span>
             </div>
         </div>
diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
index 279bda210..63c251451 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
@@ -7,8 +7,10 @@
     using System.Text.RegularExpressions;
     using System.Threading.Tasks;
     using System.Web;
+    using LearningHub.Nhs.Models.Entities.Resource;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Resource;
+    using LearningHub.Nhs.Models.Resource.Blocks;
     using LearningHub.Nhs.Models.Resource.Contribute;
     using LearningHub.Nhs.Models.Resource.Files;
     using LearningHub.Nhs.WebUI.Interfaces;
@@ -228,7 +230,7 @@ public async Task<ActionResult> DeleteResourceVersion(int resourceVersionId)
             var validationResult = await this.contributeService.DeleteResourceVersionAsync(resourceVersionId);
             if (validationResult.IsValid)
             {
-                if (associatedFile.Any())
+                if (associatedFile != null && associatedFile.Any())
                 {
                     _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(null, associatedFile); });
                 }
@@ -348,7 +350,7 @@ public async Task<ActionResult> PublishResourceVersionAsync([FromBody] PublishVi
                 if (associatedResource.ResourceTypeEnum != ResourceTypeEnum.Scorm && associatedResource.ResourceTypeEnum != ResourceTypeEnum.Html)
                 {
                     var obsoleteFiles = await this.resourceService.GetObsoleteResourceFile(publishViewModel.ResourceVersionId);
-                    if (obsoleteFiles.Any())
+                    if (obsoleteFiles != null && obsoleteFiles.Any())
                     {
                         await this.fileService.PurgeResourceFile(null, obsoleteFiles);
                     }
@@ -490,7 +492,13 @@ public async Task<ActionResult> SaveWeblinkDetailAsync([FromBody] WebLinkViewMod
         [Route("SaveCaseDetail")]
         public async Task<ActionResult> SaveCaseDetailAsync([FromBody] CaseViewModel request)
         {
+            var existingResourceState = await this.resourceService.GetResourceVersionExtendedAsync(request.ResourceVersionId);
             int resourceVersionId = await this.contributeService.SaveCaseDetailAsync(request);
+            if (existingResourceState.CaseDetails?.BlockCollection != null)
+            {
+                this.RemoveBlockCollectionFiles(existingResourceState.CaseDetails.BlockCollection, request.BlockCollection);
+            }
+
             return this.Ok(resourceVersionId);
         }
 
@@ -503,7 +511,13 @@ public async Task<ActionResult> SaveCaseDetailAsync([FromBody] CaseViewModel req
         [Route("SaveAssessmentDetail")]
         public async Task<ActionResult> SaveAssessmentDetailAsync([FromBody] AssessmentViewModel request)
         {
+            var existingResourceState = await this.resourceService.GetResourceVersionExtendedAsync(request.ResourceVersionId);
             int resourceVersionId = await this.contributeService.SaveAssessmentDetailAsync(request);
+            if (existingResourceState != null && existingResourceState.AssessmentDetails != null)
+            {
+                this.RemoveBlockCollectionFiles(existingResourceState.AssessmentDetails, request);
+            }
+
             return this.Ok(resourceVersionId);
         }
 
@@ -623,5 +637,258 @@ private async Task<bool> UserCanEditCatalogue(int catalogueId)
         {
             return await this.catalogueService.CanCurrentUserEditCatalogue(catalogueId);
         }
+
+        private void RemoveBlockCollectionFiles(AssessmentViewModel existingModel, AssessmentViewModel newModel)
+        {
+            if (existingModel is { EndGuidance: { } } && existingModel.EndGuidance.Blocks != null)
+            {
+               this.RemoveBlockCollectionFiles(existingModel.EndGuidance, newModel.EndGuidance);
+            }
+
+            if (existingModel is { AssessmentContent: { } } && existingModel.AssessmentContent.Blocks != null)
+            {
+                this.RemoveBlockCollectionFiles(existingModel.AssessmentContent, newModel.AssessmentContent);
+            }
+        }
+
+        private void RemoveBlockCollectionFiles(BlockCollectionViewModel existingResource, BlockCollectionViewModel newResource)
+        {
+            try
+            {
+                var filePaths = new List<string>();
+                if (existingResource != null)
+                {
+                    var allBlocks = existingResource.Blocks.ToList();
+                    var newBlocks = newResource.Blocks.ToList();
+                    if (allBlocks.Any())
+                    {
+                        var existingAttachements = allBlocks.Where(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Attachment && x.MediaBlock.Attachment != null).ToList();
+                        if (existingAttachements.Any())
+                        {
+                            foreach (var oldblock in existingAttachements)
+                            {
+                                var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Attachment && x.MediaBlock.Attachment != null && x.MediaBlock.Attachment.File?.FileId == oldblock.MediaBlock.Attachment?.File?.FileId);
+                                if (entry == null)
+                                {
+                                    filePaths.Add(oldblock.MediaBlock.Attachment?.File?.FilePath);
+                                }
+                            }
+                        }
+
+                        var existingVideos = allBlocks.Where(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Video && x.MediaBlock.Video != null).ToList();
+                        if (existingVideos.Any())
+                        {
+                            foreach (var oldblock in existingVideos)
+                            {
+                                var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Video && x.MediaBlock.Video != null && x.MediaBlock.Video.VideoFile?.File?.FileId == oldblock.MediaBlock?.Video?.VideoFile?.File?.FileId);
+                                if (entry == null)
+                                {
+                                    if (!string.IsNullOrWhiteSpace(oldblock.MediaBlock.Video.File.FilePath))
+                                    {
+                                        filePaths.Add(oldblock.MediaBlock.Video.File.FilePath);
+                                    }
+
+                                    if (!string.IsNullOrWhiteSpace(oldblock.MediaBlock.Video?.File?.VideoFile?.File?.FilePath))
+                                    {
+                                        filePaths.Add(oldblock.MediaBlock.Video.File.VideoFile.File.FilePath);
+                                    }
+
+                                    if (oldblock.MediaBlock?.Video?.File?.VideoFile?.TranscriptFile?.File?.FilePath != null)
+                                    {
+                                        filePaths.Add(oldblock.MediaBlock.Video.File.VideoFile.TranscriptFile.File.FilePath);
+                                    }
+                                }
+                            }
+                        }
+
+                        var existingImages = allBlocks.Where(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Image && x.MediaBlock.Image != null).ToList();
+                        if (existingImages.Any())
+                        {
+                            foreach (var oldblock in existingImages)
+                            {
+                                var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Image && x.MediaBlock.Image != null && x.MediaBlock?.Image?.File?.FileId == oldblock.MediaBlock?.Image?.File?.FileId);
+                                if (entry == null)
+                                {
+                                    filePaths.Add(oldblock?.MediaBlock?.Image?.File?.FilePath);
+                                }
+                            }
+                        }
+
+                        var existingImageCarousel = allBlocks.Where(x => x.BlockType == BlockType.ImageCarousel && x.ImageCarouselBlock != null && x.ImageCarouselBlock.ImageBlockCollection != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks != null).ToList();
+                        if (existingImageCarousel.Any())
+                        {
+                            foreach (var imageBlock in existingImageCarousel)
+                            {
+                                foreach (var oldblock in imageBlock?.ImageCarouselBlock?.ImageBlockCollection?.Blocks)
+                                {
+                                    var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.ImageCarousel && x.ImageCarouselBlock != null && x.ImageCarouselBlock.ImageBlockCollection != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks.Where(x => x.MediaBlock?.Image?.File?.FileId == oldblock.MediaBlock?.Image?.File?.FileId).Any());
+                                    if (entry == null)
+                                    {
+                                        filePaths.Add(oldblock.MediaBlock?.Image?.File?.FilePath);
+                                    }
+                                }
+                            }
+                        }
+
+                        var existingWholeSlideImages = allBlocks.Where(x => x.WholeSlideImageBlock != null && x.WholeSlideImageBlock.WholeSlideImageBlockItems.Any()).ToList();
+                        if (existingWholeSlideImages.Any())
+                        {
+                            foreach (var wsi in existingWholeSlideImages)
+                            {
+                                foreach (var oldblock in wsi?.WholeSlideImageBlock?.WholeSlideImageBlockItems)
+                                {
+                                    var entry = newBlocks.FirstOrDefault(x => x.WholeSlideImageBlock != null && x.WholeSlideImageBlock.WholeSlideImageBlockItems.Where(x => x.WholeSlideImage?.File?.FileId == oldblock.WholeSlideImage?.File?.FileId).Any());
+                                    if (entry == null)
+                                    {
+                                        filePaths.Add(oldblock.WholeSlideImage?.File?.FilePath);
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    var existingQuestionFiles = this.CheckQuestionBlock(existingResource);
+                    var newQuestionFiles = this.CheckQuestionBlock(newResource);
+                    if (existingQuestionFiles.Any())
+                    {
+                        if (!newQuestionFiles.Any())
+                        {
+                            filePaths.AddRange(existingQuestionFiles);
+                        }
+                        else
+                        {
+                            foreach (var file in existingQuestionFiles)
+                            {
+                                var entry = newQuestionFiles.FirstOrDefault(x => x.Equals(file));
+                                if (entry == null)
+                                {
+                                    filePaths.Add(file);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (filePaths != null && filePaths.Any())
+                {
+                    _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(null, filePaths); });
+                }
+            }
+            catch (Exception ex)
+            {
+            }
+        }
+
+        private List<string> CheckQuestionBlock(BlockCollectionViewModel model)
+        {
+            var filePath = new List<string>();
+            foreach (var block in model.Blocks)
+            {
+                if (block.BlockType == BlockType.Question && block.QuestionBlock != null)
+                {
+                    if (block.QuestionBlock.QuestionType == QuestionTypeEnum.MatchGame && block.QuestionBlock.Answers != null)
+                    {
+                        foreach (var answerBlock in block.QuestionBlock.Answers)
+                        {
+                            if (answerBlock.BlockCollection != null && answerBlock.BlockCollection.Blocks != null)
+                            {
+                                foreach (var imageBlock in answerBlock.BlockCollection.Blocks)
+                                {
+                                    if (imageBlock.BlockType == BlockType.Media && imageBlock.MediaBlock != null)
+                                    {
+                                        filePath.Add(imageBlock.MediaBlock.Image.File.FilePath);
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    var questionBlockCollection = block.QuestionBlock.QuestionBlockCollection;
+                    if (questionBlockCollection != null && questionBlockCollection.Blocks != null)
+                    {
+                        foreach (var questionBlock in questionBlockCollection.Blocks)
+                        {
+                            if (questionBlock.BlockType == BlockType.Media && questionBlock.MediaBlock != null)
+                            {
+                                if (questionBlock.MediaBlock.Image != null)
+                                {
+                                    filePath.Add(questionBlock.MediaBlock.Image.File.FilePath);
+                                }
+
+                                if (questionBlock.MediaBlock.Video != null)
+                                {
+                                    if (questionBlock.MediaBlock.Video.File != null)
+                                    {
+                                        filePath.Add(questionBlock.MediaBlock.Video.File.FilePath);
+                                    }
+
+                                    if (questionBlock.MediaBlock.Video.VideoFile != null)
+                                    {
+                                        if (questionBlock.MediaBlock.Video.VideoFile.TranscriptFile != null)
+                                        {
+                                            filePath.Add(questionBlock.MediaBlock.Video.VideoFile.TranscriptFile.File.FilePath);
+                                        }
+
+                                        if (questionBlock.MediaBlock.Video.VideoFile.CaptionsFile != null)
+                                        {
+                                            filePath.Add(questionBlock.MediaBlock.Video.VideoFile.CaptionsFile.File.FilePath);
+                                        }
+                                    }
+                                }
+                            }
+                            else if (questionBlock.BlockType == BlockType.WholeSlideImage && questionBlock.WholeSlideImageBlock != null)
+                            {
+                                var existingWholeSlideImages = questionBlock.WholeSlideImageBlock.WholeSlideImageBlockItems.ToList();
+                                if (existingWholeSlideImages.Any())
+                                {
+                                    foreach (var wsi in existingWholeSlideImages)
+                                    {
+                                        filePath.Add(wsi.WholeSlideImage?.File?.FilePath);
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    var feedbackBlockCollection = block.QuestionBlock.FeedbackBlockCollection;
+                    if (feedbackBlockCollection != null && feedbackBlockCollection.Blocks != null)
+                    {
+                        foreach (var feedbackBlock in feedbackBlockCollection.Blocks)
+                        {
+                            if (feedbackBlock.BlockType == BlockType.Media && feedbackBlock.MediaBlock != null)
+                            {
+                                if (feedbackBlock.MediaBlock.Image != null)
+                                {
+                                    filePath.Add(feedbackBlock.MediaBlock.Image.File.FilePath);
+                                }
+
+                                if (feedbackBlock.MediaBlock.Video != null)
+                                {
+                                    if (feedbackBlock.MediaBlock.Video.File != null)
+                                    {
+                                        filePath.Add(feedbackBlock.MediaBlock.Video.File.FilePath);
+                                    }
+
+                                    if (feedbackBlock.MediaBlock.Video.VideoFile != null)
+                                    {
+                                        if (feedbackBlock.MediaBlock.Video.VideoFile.TranscriptFile != null)
+                                        {
+                                            filePath.Add(feedbackBlock.MediaBlock.Video.VideoFile.TranscriptFile.File.FilePath);
+                                        }
+
+                                        if (feedbackBlock.MediaBlock.Video.VideoFile.CaptionsFile != null)
+                                        {
+                                            filePath.Add(feedbackBlock.MediaBlock.Video.VideoFile.CaptionsFile.File.FilePath);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return filePath;
+        }
     }
 }
diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs
index 66516430e..ba9ed57f3 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs
@@ -230,11 +230,6 @@ private async Task<bool> Commit(SCO scoObject)
             try
             {
                 var activeContent = this.userService.GetActiveContentAsync().Result;
-                ////if (activeContent.Count == 0)
-                ////{
-                ////    return false;
-                ////}
-
                 if (!activeContent.Any(ac => ac.ScormActivityId == scoObject.InstanceId))
                 {
                     throw new Exception($"User does not have ActiveContent for ScormActivityId={scoObject.InstanceId}");
@@ -265,10 +260,6 @@ private async Task<bool> Commit(SCO scoObject)
 
                 // Persist update.
                 await this.activityService.UpdateScormActivityAsync(scoObject);
-                ////if (scoObject.LessonStatusId == ScormLessionStatus.ActivityStatusId(ScormLessionStatus.Completed) || scoObject.LessonStatusId == ScormLessionStatus.ActivityStatusId(ScormLessionStatus.Passed))
-                ////{
-                ////    await this.activityService.CompleteScormActivity(scoObject);
-                ////}
 
                 return true;
             }
diff --git a/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs b/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs
index f77383f0c..d23e0881e 100644
--- a/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs
+++ b/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs
@@ -226,7 +226,7 @@ public static string GetActivityStatusText(this ActivityDetailedItemViewModel ac
         /// <returns>The <see cref="bool"/>.</returns>
         public static bool CanShowScore(this ActivityDetailedItemViewModel activityDetailedItemViewModel)
         {
-            if ((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Scorm && (activityDetailedItemViewModel.MasteryScore > 0 || activityDetailedItemViewModel.MasteryScore == null) && ((activityDetailedItemViewModel.ScorePercentage > 0 && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Passed) || activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Failed)) || ((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Case) && activityDetailedItemViewModel.Complete))
+            if ((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Scorm && (activityDetailedItemViewModel.MasteryScore > 0 || activityDetailedItemViewModel.MasteryScore == null) && ((activityDetailedItemViewModel.ScorePercentage > 0 && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Passed) || activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Failed)) || (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment && (activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed || activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Passed || activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Failed)) || (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Case && activityDetailedItemViewModel.Complete))
             {
                 return true;
             }
@@ -241,7 +241,7 @@ public static bool CanShowScore(this ActivityDetailedItemViewModel activityDetai
         /// <returns>The <see cref="bool"/>bool.</returns>
         public static bool CanViewPercentage(this ActivityDetailedItemViewModel activityDetailedItemViewModel)
         {
-            if (((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Video || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Audio) && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.InProgress) || (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment && activityDetailedItemViewModel.Complete == false))
+            if (((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Video || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Audio) && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.InProgress) || (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.InProgress))
             {
                 return true;
             }
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeBlock.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeBlock.vue
index 8ca009633..4c6aa1ec4 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeBlock.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeBlock.vue
@@ -30,7 +30,9 @@
                                                          :characterLimit="60"
                                                          :isH3="true"></EditSaveFieldWithCharacterCount>
                         <h3 class="my-0"
-                            v-else>{{ block.title }}</h3>
+                            v-else>
+                            {{ block.title }}
+                        </h3>
                         <Tick :complete="block.isReadyToPublish()"
                               class="pl-10"></Tick>
                     </div>
@@ -50,7 +52,8 @@
                                     ariaLabel="Move section down"
                                     class="contribute-block-component-button"></IconButton>
                     </div>
-                    <IconButton v-if="!canBeDuplicated" 
+                    <IconButton v-if="!canBeDuplicated && !contributeResourceAVFlag && block.blockType === BlockTypeEnum.Media"></IconButton>
+                    <IconButton v-else
                                 @click="duplicateBlock"
                                 iconClasses="fa-regular fa-clone"
                                 ariaLabel="Duplicate section"
@@ -131,6 +134,7 @@
     import ContributeImageCarouselBlock from "./ContributeImageCarouselBlock.vue";
     import { QuestionBlockModel } from "../models/contribute-resource/blocks/questionBlockModel";
     import { EventBus } from './contributeResourceEvents';
+    import { resourceData } from '../data/resource';
 
     export default Vue.extend({
         components: {
@@ -162,10 +166,12 @@
                 discardBlockModalOpen: false,
                 BlockTypeEnum: BlockTypeEnum,
                 isOpen: true,
+                contributeResourceAVFlag: true
             };
         },
         created() {
             this.isOpen = true;
+            this.getContributeResAVResourceFlag();
         },
         watch: {
             isOpen(newVal, oldVal) {
@@ -180,6 +186,11 @@
                 event.target.blur();
                 event.target.parentElement.blur();
                 this.$emit('duplicate');
+            },
+            getContributeResAVResourceFlag() {
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
+                });
             }
         }
     });
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeCaseOrAssessmentContent.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeCaseOrAssessmentContent.vue
index 4cf178069..226891170 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeCaseOrAssessmentContent.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeCaseOrAssessmentContent.vue
@@ -2,17 +2,17 @@
     <div class="contribute-case-component lh-padding-fluid">
         <div class="lh-container-xl py-15">
             <div class="py-10 text-center placeholder-text"
-                 v-if="!hasContentOnPage">You have not added any content to this page yet
+                 v-if="!hasContentOnPage">
+                You have not added any content to this page yet
             </div>
             <template v-else>
-                <FilteredBlockCollectionView
-                    :resourceType="resourceType"
-                    :blockCollection="blockCollection"
-                    :selection="blockCollection => blockCollection.getBlocksByPage(page).filter(block => block.blockType !== BlockTypeEnum.Question)"
-                    :can-be-duplicated="duplicatingBlocks"
-                    :blocksToDuplicate="blocksToDuplicate"
-                    @annotateWholeSlideImage="showSlideWithAnnotations"
-                    @duplicateBlock="blockId => $emit('duplicateBlock', blockId)"/>
+                <FilteredBlockCollectionView :resourceType="resourceType"
+                                             :blockCollection="blockCollection"
+                                             :selection="blockCollection => blockCollection.getBlocksByPage(page).filter(block => block.blockType !== BlockTypeEnum.Question)"
+                                             :can-be-duplicated="duplicatingBlocks"
+                                             :blocksToDuplicate="blocksToDuplicate"
+                                             @annotateWholeSlideImage="showSlideWithAnnotations"
+                                             @duplicateBlock="blockId => $emit('duplicateBlock', blockId)" />
             </template>
 
             <ContributeAddContentBlock @add="choosingNewContentBlock = true"></ContributeAddContentBlock>
@@ -25,13 +25,19 @@
                    ref="addMediaInput"
                    multiple
                    @change="uploadNewMediaFiles"
-                   class="visually-hidden"/>
+                   class="visually-hidden" />
+
+            <Modal v-if="avUnavailableMessage">
+                <div v-html="audioVideoUnavailableView"></div>
+                <button type="button" class="nhsuk-button nhsuk-button--secondary mt-2 col-4 col-sm-3 col-md-2" @click="cancelAVUnavailModal">Cancel</button>
+            </Modal>   
         </div>
     </div>
 </template>
 
 <script lang="ts">
     import Vue, { PropOptions } from 'vue';
+    import { resourceData } from '../data/resource';
     import ContributeBlock from './ContributeBlock.vue';
     import ContributeAddContentBlock from './ContributeAddContentBlock.vue';
     import ContributeChooseContentBlockType from './ContributeChooseContentBlockType.vue';
@@ -40,11 +46,14 @@
     import {
         FileUploadType,
         getAllowedFileExtensionsInAcceptFormat,
-        startUploadsFromFileElement
+        startUploadsFromFileElement,
+        getMediaTypeFromFileExtension
     } from '../helpers/fileUpload';
     import FilteredBlockCollectionView from './components/questions/FilteredBlockCollectionView.vue';
     import { WholeSlideImageModel } from "../models/contribute-resource/blocks/wholeSlideImageModel";
     import { ResourceType } from "../constants";
+    import { MediaTypeEnum } from '../models/contribute-resource/blocks/mediaTypeEnum';
+    import Modal from '../globalcomponents/Modal.vue';
 
     export default Vue.extend({
         props: {
@@ -59,16 +68,25 @@
             ContributeAddContentBlock,
             ContributeChooseContentBlockType,
             FilteredBlockCollectionView,
+            Modal,
         },
         data() {
             return {
                 choosingNewContentBlock: false,
                 BlockTypeEnum,
+                contributeResourceAVFlag: true,
+                avUnavailableMessage: false
             };
         },
+        created() {
+            this.getContributeResAVResourceFlag();
+        },
         computed: {
             hasContentOnPage(): boolean {
                 return this.blockCollection?.getBlocksByPage(this.page)?.filter(block => block.blockType !== BlockTypeEnum.Question).length > 0;
+            },
+            audioVideoUnavailableView(): string {
+                return this.$store.state.getAVUnavailableView;
             }
         },
         methods: {
@@ -90,14 +108,42 @@
                 }
             },
             async uploadNewMediaFiles(event: any): Promise<void> {
-                startUploadsFromFileElement(
-                    event.target as HTMLInputElement,
-                    (fileId, mediaType) => this.blockCollection.addMediaBlock(fileId, mediaType, this.page)
-                );
+                var targetItem = event.target as HTMLInputElement;
+                var startUpload = true;
+
+                if (targetItem.value !== '') {
+                    for (let i = 0; i < targetItem.files.length; i++) {
+                        const file = targetItem.files[i] as File;
+                        const fileExtension = file.name.split('.').pop();
+                        const mediaType = getMediaTypeFromFileExtension(`.${fileExtension}`);
+
+                        if (!this.contributeResourceAVFlag && (mediaType === MediaTypeEnum.Video)) {
+                            startUpload = false;
+                            this.avUnavailableMessage = true;
+                        }
+                        else { startUpload = true; }
+                    }
+                }
+
+                if (startUpload) {
+                    startUploadsFromFileElement(
+                        event.target as HTMLInputElement,
+                        (fileId, mediaType) => this.blockCollection.addMediaBlock(fileId, mediaType, this.page)
+                    );
+                }
+                targetItem.value = '';
             },
             showSlideWithAnnotations(wholeSlideImageToShow: WholeSlideImageModel) {
                 this.$emit('annotateWholeSlideImage', wholeSlideImageToShow, false);
             },
+            cancelAVUnavailModal() {
+                this.avUnavailableMessage = false;
+            },
+            getContributeResAVResourceFlag() {
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
+                });
+            }
         },
     });
 </script>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceType.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceType.vue
index d43ed711a..4fb3f6621 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceType.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceType.vue
@@ -6,23 +6,19 @@
         <div class="mx-5">
             <h3 class="nhsuk-heading-l nhsuk-u-margin-bottom-2">{{title}}</h3>
             <div>{{description}}</div>
-            <div v-if="!contributeResourceAVFlag && title === 'File' && !isSelected" class="align-self-center">
-                <div v-html="audioVideoUnavailableView"></div>
-            </div>
-        </div>
-        <div v-if="isSelected" class="align-self-center select_resource_type_component_tick_wrapper">
-            <Tick class="select_resource_type_component_tick" complete></Tick>
         </div>
         <div v-if="!isSelected" class="align-self-center">
             <Button v-on:click="onSelectClick">Select</Button>
         </div>
+        <div v-if="isSelected" class="align-self-center select_resource_type_component_tick_wrapper">
+            <Tick class="select_resource_type_component_tick" complete></Tick>
+        </div>
     </div>
 </template>
 
 <script lang="ts">
     import Vue, { PropOptions } from 'vue';
     import { commonlib } from '../common';
-    import { resourceData } from '../data/resource';
     import Button from '../globalcomponents/Button.vue';
     import Tick from '../globalcomponents/Tick.vue';
     import { ResourceType } from '../constants';
@@ -37,14 +33,6 @@
             resourceType: { type: Number } as PropOptions<ResourceType>,
             resourceDetails: { type: Object } as PropOptions<ContributeResourceDetailModel>,
         },
-        data() {
-            return {
-                contributeResourceAVFlag: true
-            };
-        },
-        created() {
-            this.getContributeResAVResourceFlag();
-        },
         computed: {
             title(): String {
                 return commonlib.getResourceTypeText(this.resourceType);
@@ -57,17 +45,9 @@
             },
             isSelected(): boolean {
                 return this.resourceDetails.resourceType === this.resourceType;
-            },
-            audioVideoUnavailableView(): string {
-                return this.$store.state.getAVUnavailableView;
             }
         },
         methods: {
-            getContributeResAVResourceFlag() {
-                resourceData.getContributeAVResourceFlag().then(response => {
-                    this.contributeResourceAVFlag = response;
-                });
-            },
             getResourceTypeDescription(resourceType: ResourceType): string {
                 switch (resourceType) {
                     case ResourceType.ARTICLE:
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceTypeContainer.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceTypeContainer.vue
index c94e680e4..e077efa9f 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceTypeContainer.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceTypeContainer.vue
@@ -2,6 +2,9 @@
     <div class="lh-padding-fluid">
         <div class="lh-container-xl">
             <h2 id="title-label" class="nhsuk-heading-l">Select a resource type</h2>
+            <div v-if="!contributeResourceAVFlag" class="align-self-center">
+                <div v-html="audioVideoUnavailableView"></div>
+            </div>
             <SelectResourceType :resourceType="resourceType.GENERICFILE" v-bind:resourceDetails="resourceDetails"></SelectResourceType>
             <SelectResourceType :resourceType="resourceType.WEBLINK" v-bind:resourceDetails="resourceDetails"></SelectResourceType>
             <SelectResourceType :resourceType="resourceType.ARTICLE" v-bind:resourceDetails="resourceDetails"></SelectResourceType>
@@ -18,6 +21,7 @@
     import SelectResourceType from './SelectResourceType.vue';
     import { ResourceType } from '../constants';
     import { ContributeResourceDetailModel } from '../models/contribute/contributeResourceModel';
+    import { resourceData } from '../data/resource';
 
     export default Vue.extend({
         props: {
@@ -28,8 +32,24 @@
         },
         data() {
             return {
-                resourceType: ResourceType
+                resourceType: ResourceType,
+                contributeResourceAVFlag: true
             }
+        },
+        created() {
+            this.getContributeResAVResourceFlag();
+        },
+        computed: {
+            audioVideoUnavailableView(): string {
+                return this.$store.state.getAVUnavailableView;
+            }
+        },
+        methods: {
+            getContributeResAVResourceFlag() {
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
+                });
+            },
         }
     });
 </script>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/ChooseContentBlockOption.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/ChooseContentBlockOption.vue
index 2e12425a7..8ac6f1b21 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/ChooseContentBlockOption.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/ChooseContentBlockOption.vue
@@ -1,11 +1,14 @@
 <template>
     <div class="contribute-add-content-block-component-option">
         <div class="contribute-add-content-block-component-option--icon">
-            <img v-bind:src="imgSrc" class="flexible-image"/>
+            <img v-bind:src="imgSrc" class="flexible-image" />
         </div>
         <div class="contribute-add-content-block-component-option--description">
             <h5>{{blockTypeName}}</h5>
             <p>{{blockDescription}}</p>
+            <div v-if="!contributeResourceAVFlag && blockTypeName === 'Media'">
+                <div v-html="audioVideoUnavailableView"></div>
+            </div>
         </div>
         <Button v-on:click="$emit('choose')">Select</Button>
     </div>
@@ -13,6 +16,7 @@
 
 <script lang="ts">
     import Vue, { PropOptions } from 'vue';
+    import { resourceData } from '../../../data/resource';
 
     import Button from "../../../globalcomponents/Button.vue";
 
@@ -27,6 +31,26 @@
             blockTypeName: String,
             blockDescription: String,
         },
+        data() {
+            return {
+                contributeResourceAVFlag: true
+            }
+        },
+        created() {
+            this.getContributeResAVResourceFlag();
+        },
+        computed: {
+            audioVideoUnavailableView(): string {
+                return this.$store.state.getAVUnavailableView;
+            },
+        },
+        methods: {
+            getContributeResAVResourceFlag() {
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
+                });
+            }
+        }
     })
 </script>
 
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/ContributeMediaBlock.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/ContributeMediaBlock.vue
index 3c19d4ee6..dbc5bd9e4 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/ContributeMediaBlock.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/ContributeMediaBlock.vue
@@ -2,14 +2,18 @@
     <div class="contribute-media-block">
         <MediaBlockAttachment v-if="mediaBlock.mediaType === MediaTypeEnum.Attachment"
                               v-on:updatePublishingStatus="updatePublishingStatus"
-                              v-bind:attachment="attachment"/>
+                              v-bind:attachment="attachment" />
         <MediaBlockImage v-if="mediaBlock.mediaType === MediaTypeEnum.Image"
                          v-on:updatePublishingStatus="updatePublishingStatus"
-                         v-bind:image="image"/>
-        <MediaBlockVideo v-if="mediaBlock.mediaType === MediaTypeEnum.Video"
+                         v-bind:image="image" />
+
+        <MediaBlockVideo v-if="mediaBlock.mediaType === MediaTypeEnum.Video && contributeResourceAVFlag"
                          v-on:updatePublishingStatus="updatePublishingStatus"
-                         v-bind:video="video"/>
+                         v-bind:video="video" />
 
+        <div v-if="!contributeResourceAVFlag && (mediaBlock.mediaType === MediaTypeEnum.Video)">
+            <div v-html="audioVideoUnavailableView"></div>
+        </div>        
     </div>
 </template>
 
@@ -23,6 +27,7 @@
     import MediaBlockImage from "./MediaBlockImage.vue";
     import MediaBlockVideo from "./MediaBlockVideo.vue";
     import Tick from "../../../globalcomponents/Tick.vue";
+    import { resourceData } from '../../../data/resource';
 
     import { AttachmentModel } from "../../../models/contribute-resource/blocks/attachmentModel";
     import { FileUploadType } from '../../../helpers/fileUpload';
@@ -43,13 +48,17 @@
         props: {
             mediaBlock: { type: Object } as PropOptions<MediaBlockModel>,
         },
-        data(){
+        data() {
             return {
                 FileUploadType: FileUploadType,
                 FileStore: FileStore /* It looks like FileStore isn't used, but we need it to be exposed here to allow Vue to make the files list reactive */,
                 MediaTypeEnum: MediaTypeEnum,
+                contributeResourceAVFlag: true
             }
         },
+        created() {
+            this.getContributeResAVResourceFlag();
+        },
         computed: {
             attachment(): AttachmentModel {
                 return this.mediaBlock.attachment;
@@ -59,11 +68,19 @@
             },
             video(): VideoMediaModel {
                 return this.mediaBlock.video;
+            },
+            audioVideoUnavailableView(): string {
+                return this.$store.state.getAVUnavailableView;
             }
         },
         methods: {
             updatePublishingStatus() {
                 this.mediaBlock.updatePublishingStatus();
+            },
+            getContributeResAVResourceFlag() {
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
+                });
             }
         }
     })
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/published-view/ContributeMediaBlockPublishedView.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/published-view/ContributeMediaBlockPublishedView.vue
index 7e4650ae6..0753395c5 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/published-view/ContributeMediaBlockPublishedView.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/published-view/ContributeMediaBlockPublishedView.vue
@@ -1,9 +1,14 @@
 <template>
     <div class="contribute-media-block">
 
-        <AttachmentPublishedView v-if="mediaType === MediaTypeEnum.Attachment" v-bind:attachment="attachment"/>
-        <ImagePublishedView v-if="mediaType === MediaTypeEnum.Image" v-bind:image="image"/>
-        <VideoPlayerContainer v-if="mediaType === MediaTypeEnum.Video" :video="video"/>
+        <AttachmentPublishedView v-if="mediaType === MediaTypeEnum.Attachment" v-bind:attachment="attachment" />
+        <ImagePublishedView v-if="mediaType === MediaTypeEnum.Image" v-bind:image="image" />
+        <div v-if="!contributeResourceAVFlag && mediaType === MediaTypeEnum.Video">
+            <div v-html="audioVideoUnavailableView"></div>
+        </div>
+        <div v-else>
+            <VideoPlayerContainer v-if="mediaType === MediaTypeEnum.Video" :video="video" />
+        </div>
 
     </div>
 </template>
@@ -12,6 +17,7 @@
     import Vue, { PropOptions } from 'vue';
 
     import FileInfo from '../content-tab/FileInfo.vue';
+    import { resourceData } from '../../../data/resource';
     import AttachmentPublishedView from './AttachmentPublishedView.vue';
     import ImagePublishedView from './ImagePublishedView.vue';
     import VideoPlayerContainer from '../VideoPlayerContainer.vue';
@@ -37,12 +43,16 @@
             return {
                 FileStore: FileStore,
                 MediaTypeEnum: MediaTypeEnum,
+                contributeResourceAVFlag: true,
+                audioVideoUnavailableView: ''
             }
         },
         created() {
             // We poll for files (e.g. videos) that did not finish processing when the Resource was being created.
             // So, when the file processing succeeds/fails, this is can be reflected in the published view.
             this.FileStore.enablePolling();
+            this.getContributeResAVResourceFlag();
+            this.getContributeResAVUnavailableView();
         },
         computed: {
             mediaType(): MediaTypeEnum {
@@ -58,5 +68,17 @@
                 return this.mediaBlock.video;
             }
         },
+        methods: {
+            getContributeResAVResourceFlag() {
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
+                });
+            },
+            getContributeResAVUnavailableView() {
+                resourceData.getAVUnavailableView().then(response => {
+                    this.audioVideoUnavailableView = response;
+                });
+            },
+        }
     })
 </script>
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/AddBlocksMenu.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/AddBlocksMenu.vue
index f48c1f0c3..3ca51587e 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/AddBlocksMenu.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/AddBlocksMenu.vue
@@ -1,7 +1,15 @@
 <template>
     <div class="block-menu-container">
-        <Button @click="addMediaBlock(FileUploadType.Video)" class="nhsuk-u-margin-bottom-3">+ Add video</Button>
+        <div v-if="!contributeResourceAVFlag">
+            <div v-html="audioVideoUnavailableView"></div>
+        </div>
+        <div v-else>
+            <Button @click="addMediaBlock(FileUploadType.Video)" class="nhsuk-u-margin-bottom-3">+ Add video</Button>
+        </div>
+
         <Button @click="addMediaBlock(FileUploadType.Image)">+ Add image</Button>
+
+
         <input type="file"
                ref="addMediaInput"
                multiple
@@ -11,6 +19,7 @@
 </template>
 <script lang="ts">
     import Vue from 'vue';
+    import { resourceData } from '../../../data/resource';
     import Button from '../../../globalcomponents/Button.vue';
     import { FileUploadType, startUploadsFromFileElement, getFileExtensionAllowedList } from '../../../helpers/fileUpload';
 
@@ -20,9 +29,16 @@
         },
 
         data() {
-            return { FileUploadType };
+            return { FileUploadType, contributeResourceAVFlag: true };
+        },
+        computed: {            
+            audioVideoUnavailableView(): string {
+                return this.$store.state.getAVUnavailableView;
+            }
+        },
+        created() {
+            this.getContributeResAVResourceFlag();
         },
-
         methods: {
             addMediaBlock(fileUploadType: FileUploadType) {
                 let inputElement = this.$refs.addMediaInput as any;
@@ -35,6 +51,11 @@
                     (fileId, mediaType) => this.$emit('add-media-block', fileId, mediaType)
                 );
             },
+            getContributeResAVResourceFlag() {
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
+                });
+            },
         }
     });
 </script>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
index 9bd2339d9..a74f8443a 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
@@ -501,6 +501,7 @@
                 localScormDetail: null as ScormResourceModel,
                 showError: false,
                 errorMessage: '',
+                contributeResourceAVFlag: true,
             }
         },
         computed: {
@@ -608,9 +609,6 @@
             hierarchyEditLoaded(): boolean {
                 return this.$store.state.hierarchyEditLoaded;
             },
-            contributeResourceAVFlag(): boolean {
-                return this.$store.state.contributeAVResourceFlag;
-            },
             audioVideoUnavailableView(): string {
                 return this.$store.state.getAVUnavailableView;
             },
@@ -631,6 +629,7 @@
             if (!this.$store.state.fileTypes) {
                 this.$store.commit('populateFileTypes');
             }
+            this.getContributeResAVResourceFlag();
             this.uploadResourceTypes = await resourceData.getUploadResourceTypes();
             const allResourceTypes = this.uploadResourceTypes.slice();
             const allowedTypes = this.resourceTypesSupported.split(',');
@@ -647,6 +646,11 @@
             this.localScormDetail = _.cloneDeep(this.scormDetail);
         },
         methods: {
+            getContributeResAVResourceFlag() {
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
+                });
+            },
             setSpecificContentLocalValid(val: boolean) {
                 this.specificContentLocalValid = val;
             },
@@ -906,7 +910,7 @@
                         if (this.selectedResourceType != ResourceType.UNDEFINED) {
                             let fileExtension = this.uploadingFile.name.split(".").pop();
                             let resourceType: ResourceType = ResourceType.GENERICFILE;
-                           if (fileExtension.toLowerCase() == 'zip' && this.selectedResourceType == ResourceType.SCORM) {
+                            if (fileExtension.toLowerCase() == 'zip' && this.selectedResourceType == ResourceType.SCORM) {
                                 resourceType = ResourceType.SCORM;
                             } else if (fileExtension.toLowerCase() == 'zip' && this.selectedResourceType == ResourceType.HTML) {
                                 resourceType = ResourceType.HTML;
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentAudio.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentAudio.vue
index 28b2e326b..cce5ff19b 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentAudio.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentAudio.vue
@@ -5,7 +5,10 @@
                 <h3>Uploaded file</h3>
             </div>
         </div>
-        <div class="row">
+        <div v-if="!contributeResourceAVFlag">
+            <div v-html="audioVideoUnavailableView"></div>
+        </div>
+        <div v-else class="row">
             <file-panel :file-id="localAudioDetail.file.fileId" :file-description="localAudioDetail.file.fileName" :file-size="localAudioDetail.file.fileSizeKb" @changefile="changeFile"></file-panel>
         </div>
 
@@ -80,7 +83,8 @@
                 localAudioDetail: { resourceVersionId: 0 } as AudioResourceModel,
                 additionalInformation: '' as string,
                 uploadingFile: null as File,
-                uploadingTranscriptFile: null as File
+                uploadingTranscriptFile: null as File,
+                contributeResourceAVFlag: true
             };
         },
         computed: {
@@ -95,10 +99,14 @@
             },
             fileUpdated(): ResourceFileModel {
                 return this.$store.state.fileUpdated;
+            },
+            audioVideoUnavailableView(): string {
+                return this.$store.state.getAVUnavailableView;
             }
         },
         created() {
             this.setInitialValues();
+            this.getContributeResAVResourceFlag();
             EventBus.$on('deleteFile', (fileTypeToBeDeleted: number) => {
                 this.processDeleteFile(fileTypeToBeDeleted);
             });
@@ -112,6 +120,11 @@
             changeFile() {
                 this.$emit('filechanged');
             },
+            getContributeResAVResourceFlag() {
+                resourceData.getContributeAVResourceFlag().then(response => {
+                    this.contributeResourceAVFlag = response;
+                });
+            },
             changeTranscriptFile() {
                 $('#transcriptFileUpload').val(null);
                 $('#transcriptFileUpload').click();
diff --git a/LearningHub.Nhs.WebUI/Services/FileService.cs b/LearningHub.Nhs.WebUI/Services/FileService.cs
index 1aa8078e8..0e6fce092 100644
--- a/LearningHub.Nhs.WebUI/Services/FileService.cs
+++ b/LearningHub.Nhs.WebUI/Services/FileService.cs
@@ -7,11 +7,9 @@
     using System.Threading.Tasks;
     using Azure.Storage.Files.Shares;
     using Azure.Storage.Files.Shares.Models;
-    using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Resource;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Interfaces;
-    using Microsoft.AspNetCore.Mvc.Filters;
     using Microsoft.AspNetCore.StaticFiles;
     using Microsoft.Extensions.Options;
 
@@ -23,6 +21,7 @@ public class FileService : IFileService
         private readonly Settings settings;
         private ShareClient shareClient;
         private ShareClient archiveShareClient;
+        private ShareClient contentArchiveShareClient;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="FileService"/> class.
@@ -59,21 +58,21 @@ private ShareClient OutputArchiveShareClient
         {
             get
             {
-                if (this.archiveShareClient == null)
+                if (this.contentArchiveShareClient == null)
                 {
                     var options = new ShareClientOptions();
                     options.Retry.MaxRetries = 3;
                     options.Retry.Delay = TimeSpan.FromSeconds(10);
 
-                    this.archiveShareClient = new ShareClient(this.settings.AzureContentArchiveStorageConnectionString, this.settings.AzureFileStorageResourceShareName, options);
+                    this.contentArchiveShareClient = new ShareClient(this.settings.AzureContentArchiveStorageConnectionString, this.settings.AzureFileStorageResourceShareName, options);
 
-                    if (!this.archiveShareClient.Exists())
+                    if (!this.contentArchiveShareClient.Exists())
                     {
                         throw new Exception($"Unable to access azure content archive file storage resource {this.settings.AzureFileStorageResourceShareName}");
                     }
                 }
 
-                return this.archiveShareClient;
+                return this.contentArchiveShareClient;
             }
         }
 
@@ -89,7 +88,7 @@ private ShareClient InputArchiveShareClient
 
                     this.archiveShareClient = new ShareClient(this.settings.AzureSourceArchiveStorageConnectionString, this.settings.AzureFileStorageResourceShareName, options);
 
-                    if (!this.shareClient.Exists())
+                    if (!this.archiveShareClient.Exists())
                     {
                         throw new Exception($"Unable to access azure file storage resource {this.settings.AzureFileStorageResourceShareName}");
                     }
@@ -130,6 +129,7 @@ public async Task DeleteChunkDirectory(string directoryRef, int chunks)
         public async Task<ShareFileDownloadInfo> DownloadFileAsync(string filePath, string fileName)
         {
             var directory = this.ShareClient.GetDirectoryClient(filePath);
+            var sourceDirectory = this.InputArchiveShareClient.GetDirectoryClient(filePath);
 
             if (await directory.ExistsAsync())
             {
@@ -140,6 +140,15 @@ public async Task<ShareFileDownloadInfo> DownloadFileAsync(string filePath, stri
                     return await file.DownloadAsync();
                 }
             }
+            else if (await sourceDirectory.ExistsAsync())
+            {
+                var file = sourceDirectory.GetFileClient(fileName);
+
+                if (await file.ExistsAsync())
+                {
+                    return await file.DownloadAsync();
+                }
+            }
 
             return null;
         }
@@ -221,50 +230,10 @@ public async Task PurgeResourceFile(ResourceVersionExtendedViewModel vm = null,
                 {
                     allContentPath.Add(vm.ScormDetails.ContentFilePath);
                 }
-                else if (vm.GenericFileDetails != null && !string.IsNullOrWhiteSpace(vm.GenericFileDetails.File.FilePath))
-                {
-                    allFilePath.Add(vm.GenericFileDetails.File.FilePath);
-                }
                 else if (vm.HtmlDetails != null && !string.IsNullOrWhiteSpace(vm.HtmlDetails.ContentFilePath))
                 {
                     allContentPath.Add(vm.HtmlDetails.ContentFilePath);
                 }
-                else if (vm.ImageDetails != null && !string.IsNullOrWhiteSpace(vm.ImageDetails.File?.FilePath))
-                {
-                    allFilePath.Add(vm.ImageDetails.File?.FilePath);
-                }
-                else if (vm.ArticleDetails != null)
-                {
-                    var files = vm.ArticleDetails.Files.ToList();
-                    if (files.Any())
-                    {
-                        foreach (var file in files)
-                        {
-                            allFilePath.Add(file.FilePath);
-                        }
-                    }
-                }
-                else if (vm.CaseDetails != null)
-                {
-                    var blockCollection = vm.CaseDetails.BlockCollection;
-                    foreach (var entry in blockCollection.Blocks)
-                    {
-                        if (entry.ImageCarouselBlock != null)
-                        {
-                            foreach (var item in entry.ImageCarouselBlock?.ImageBlockCollection?.Blocks)
-                            {
-                                allFilePath.Add(item?.MediaBlock?.Image?.File.FilePath);
-                            }
-                        }
-                        else if (entry.WholeSlideImageBlock != null)
-                        {
-                            foreach (var item in entry.WholeSlideImageBlock.WholeSlideImageBlockItems)
-                            {
-                                allFilePath.Add(item?.WholeSlideImage?.File.FilePath);
-                            }
-                        }
-                    }
-                }
 
                 // audio and video to be added
                 await this.MoveInPutDirectoryToArchive(allFilePath);
@@ -388,6 +357,7 @@ private async Task DeleteSubdirectory(string pathDirectory)
                 {
                     var sourceFileClient = sourceDirectory.GetFileClient(fileDirectory.Name);
                     await this.DeleteSubdirectory(sourceFileClient.Path);
+                    await sourceFileClient.DeleteIfExistsAsync();
                 }
                 else
                 {
@@ -405,6 +375,20 @@ private async Task MoveInPutDirectoryToArchive(List<string> allDirectoryRef)
                 {
                     var directory = this.ShareClient.GetDirectoryClient(directoryRef);
                     var archiveDirectory = this.InputArchiveShareClient.GetDirectoryClient(directoryRef);
+                    if (!directory.Exists())
+                    {
+                        continue;
+                    }
+
+                    if (directory.Exists())
+                    {
+                        var inputCheck = directory.GetFilesAndDirectories();
+                        if (inputCheck.Count() > 1)
+                        {
+                            await this.MoveOutPutDirectoryToArchive(new List<string> { directoryRef });
+                            continue;
+                        }
+                    }
 
                     await foreach (var fileItem in directory.GetFilesAndDirectoriesAsync())
                     {
diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/bookmark.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/bookmark.scss
index bc8bac3c9..6378eae15 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/bookmark.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/bookmark.scss
@@ -29,7 +29,7 @@ a.cancel-link:visited {
     }
 }
 
-.folder-title {
+div.folder-title {
     font-weight: bold;
 }
 
diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss
index 4aba85b35..22ffd1a18 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss
@@ -29,6 +29,13 @@ textarea {
     }
 }
 
+@media(min-width: 40.0625em) {
+    .folder-title {
+        font-size: 24px;
+        font-size: 1.5rem;
+    }
+}
+
 .folder-title_empty {
     display: flex;
 
@@ -91,9 +98,13 @@ textarea {
     padding: 20px 0 32px 0;
     border-bottom: 1px solid $nhsuk-grey-light;
 
-    p, h3 {
+    p, h2, h3 {
         margin: 0;
     }
+
+    h2.nhsuk-u-reading-width {
+        font-size: x-large;
+    }
 }
 
 .personal-details-table {
diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss
index 9e800942d..c43713aaa 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss
@@ -156,6 +156,10 @@
         .search-filter-items {
             border-top: 1px $nhsuk-grey-light solid;
             background-color: $nhsuk-grey-white;
+
+            h2 {
+                font-size: larger;
+            }
         }
     }
 
diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml
index d184442fb..6eda29434 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml
@@ -76,7 +76,7 @@
                     }
                   </div>
                   <div>
-                    <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" role="button" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
+                    <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
                      asp-route-bookmarked="@item.IsBookmarked"
                      asp-route-id="@item.BookmarkId"
                      asp-route-title="@item.Name.Truncate(60)"
@@ -90,7 +90,7 @@
                 <div>
                   @if (!string.IsNullOrEmpty(item.BadgeUrl))
                   {
-                    <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="@(item.Name)" class="catalogue-card-badge" />
+                    <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="Provider's catalogue badge" class="catalogue-card-badge" />
                   }
                 </div>
               </div>
diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
index 23be8c9a0..4a62262bc 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
@@ -126,7 +126,7 @@
       <div class="catalogue-title nhsuk-u-margin-bottom-7">
         @if (!string.IsNullOrEmpty(Model.Catalogue.BadgeUrl))
         {
-          <img alt="ELFH catalogue badge" src="@GetBadgeUrl()" class="catalogue-badge" />
+          <img alt="Provider's catalogue badge" src="@GetBadgeUrl()" class="catalogue-badge" />
         }
 
         <h1 class="heading-lg title nhsuk-u-margin-bottom-0">@(ViewBag.ActiveTab == "browse" && Model.NodeDetails != null ? Model.NodeDetails.Name : Model.Catalogue.Name)</h1>
@@ -140,7 +140,7 @@
       @if (ViewBag.UserAuthenticated)
       {
         <div class="nhsuk-u-margin-bottom-4">
-          <a class="nhsuk-u-font-size-16" role="button" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
+          <a class="nhsuk-u-font-size-16" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
            asp-route-bookmarked="@Model.Catalogue.IsBookmarked"
            asp-route-id="@Model.Catalogue.BookmarkId"
            asp-route-title="@Model.Catalogue.Name.Truncate(60)"
diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/_ContentStructure.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/_ContentStructure.cshtml
index 492ab0933..a39cfebcd 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/_ContentStructure.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/_ContentStructure.cshtml
@@ -10,22 +10,22 @@
     {
       @if (item.IsEmptyFolder)
       {
-        <h3 class="folder-title">
+        <h2 class="folder-title">
           <img src="/images/folder-icon.svg" alt="folder icon" />
           <a asp-controller="Catalogue" asp-route-reference="@Model.Catalogue.Url" asp-route-nodeId="@item.NodeId">@item.Name</a>
-        </h3>
+        </h2>
       }
       else
       {
-        <h3 class="folder-title_empty">
+        <h2 class="folder-title_empty">
           <img src="/images/folder-icon.svg" alt="folder icon" />
           @item.Name
-        </h3>
+        </h2>
       }
     }
         else
         {
-            <h3 class="nhsuk-u-reading-width"><a asp-controller="Resource" asp-action="Index" asp-route-resourcereferenceid="@item.ResourceReferenceId">@item.Name</a></h3>
+            <h2 class="nhsuk-u-reading-width"><a asp-controller="Resource" asp-action="Index" asp-route-resourcereferenceid="@item.ResourceReferenceId">@item.Name</a></h2>
             <div class="resource-metadata">
                 <div class="nhsuk-u-padding-right-5"><span class="nhsuk-u-font-weight-bold">Type:</span> @UtilityHelper.GetPrettifiedResourceTypeName((ResourceTypeEnum)item.ResourceTypeId, item.DurationInMilliseconds)</div>
                 <div class="nhsuk-u-padding-right-5 star-rating-container">
diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml
index 2e7f5c50b..c8d254bf8 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml
@@ -5,9 +5,7 @@
         <label class="nhsuk-label nhsuk-u-visually-hidden" for="sub-search-field">Search</label>
         <input class="nhsuk-input nhsuk-search__input" type="search" name="term" autocomplete="off" id="sub-search-field" value="@Model" placeholder="Search">
         <button class="nhsuk-search__submit" type="submit">
-            <span class="nhsuk-u-visually-hidden">
-                Submit
-            </span>
+            <span class="nhsuk-u-visually-hidden">Search</span>
             <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
                 <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
             </svg>
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
index 4512c50f7..ac50513b8 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
@@ -50,7 +50,7 @@
             }
           </div>
           <div>
-            <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" role="button" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
+            <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
                asp-route-bookmarked="@Model.IsBookmarked"
                asp-route-id="@Model.BookmarkId"
                asp-route-title="@Model.Name.Truncate(60)"
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
index 309c4dad3..6379cddb7 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
@@ -65,7 +65,7 @@
             }
           </div>
           <div>
-            <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" role="button" asp-controller="Bookmark" asp-action="BookmarkResource"
+            <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" asp-controller="Bookmark" asp-action="BookmarkResource"
                asp-route-bookmarked="@Model.Item2.IsBookmarked"
                asp-route-id="@Model.Item2.BookmarkId"
                asp-route-title="@Model.Item2.Title.Truncate(60)"
diff --git a/LearningHub.Nhs.WebUI/Views/Resource/Resource.cshtml b/LearningHub.Nhs.WebUI/Views/Resource/Resource.cshtml
index 0c89a0f24..cf63994c4 100644
--- a/LearningHub.Nhs.WebUI/Views/Resource/Resource.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Resource/Resource.cshtml
@@ -190,7 +190,7 @@
                         </form>
                     }
                 </div>
-                <a class="nhsuk-u-font-size-16" role="button" asp-controller="Bookmark" asp-action="BookmarkResource"
+                <a class="nhsuk-u-font-size-16" asp-controller="Bookmark" asp-action="BookmarkResource"
                    asp-route-bookmarked="@Model.ResourceItem.IsBookmarked"
                    asp-route-id="@Model.ResourceItem.BookmarkId"
                    asp-route-title="@Model.ResourceItem.Title.Truncate(60)"
@@ -256,7 +256,7 @@
                                 </form>
                             }
                         </div>
-                        <a class="nhsuk-u-font-size-16" role="button" asp-controller="Bookmark" asp-action="BookmarkResource"
+                        <a class="nhsuk-u-font-size-16" asp-controller="Bookmark" asp-action="BookmarkResource"
                            asp-route-bookmarked="@Model.ResourceItem.IsBookmarked"
                            asp-route-id="@Model.ResourceItem.BookmarkId"
                            asp-route-title="@Model.ResourceItem.Title.Truncate(60)"
diff --git a/LearningHub.Nhs.WebUI/Views/Resource/_ResourceItem.cshtml b/LearningHub.Nhs.WebUI/Views/Resource/_ResourceItem.cshtml
index 53a8e2521..21b717556 100644
--- a/LearningHub.Nhs.WebUI/Views/Resource/_ResourceItem.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Resource/_ResourceItem.cshtml
@@ -172,7 +172,7 @@
 
                     @* Video/Audio/Scorm/Case/Assessment require JavaScript - use Vue.js resource app. *@
 
-                    if (!@ViewBag.DisplayAVResourceFlag)
+                    if (!@ViewBag.DisplayAVResourceFlag && (resourceItem.AudioDetails !=null || resourceItem.VideoDetails !=null))
                     {
                         <partial name="_AudioVideoUnavailable" />
                     }
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml
index 2bcfbf19c..a27a7aba0 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml
@@ -89,11 +89,11 @@
                 <div>
                   @if (provider != null)
                   {
-                    <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name" class="provider-badge" />
+                    <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name catalogue badge" class="provider-badge" />
                   }
                   else @if (hasBadge)
                   {
-                    <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="@(item.Name)" class="catalogue-card-badge" />
+                    <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="Provider's catalogue badge" class="catalogue-card-badge" />
                   }
                 </div>
               </div>
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_ResourceFilter.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_ResourceFilter.cshtml
index 818f2bf1f..429eae962 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_ResourceFilter.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_ResourceFilter.cshtml
@@ -89,8 +89,10 @@
                     }
 
                     <div class="nhsuk-grid-row">
-                        <div class="nhsuk-grid-column-full">
-                            <h4>Sort by:</h4>
+                        <fieldset class="nhsuk-grid-column-full">
+                            <legend>
+                                <h2>Sort by:</h2>
+                            </legend>
 
                             <div class="nhsuk-radios">
                                 @foreach (var sortItem in resourceResult.SortItemList)
@@ -107,7 +109,7 @@
                                 }
 
                             </div>
-                        </div>
+                        </fieldset>
                     </div>
 
                     @if (resourceResult.SearchResourceAccessLevelFilters != null && resourceResult.SearchResourceAccessLevelFilters.Any())
@@ -115,8 +117,10 @@
                         <hr class="nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-4" />
 
                         <div class="nhsuk-grid-row">
-                            <div class="nhsuk-grid-column-full">
-                                <h4>Filter by audience access level:</h4>
+                            <fieldset class="nhsuk-grid-column-full">
+                                <legend>
+                                    <h2>Filter by audience access level:</h2>
+                                </legend>
 
                                 <div class="nhsuk-checkboxes">
                                     @foreach (var filter in resourceResult.SearchResourceAccessLevelFilters)
@@ -132,7 +136,7 @@
                                         </div>
                                     }
                                 </div>
-                            </div>
+                            </fieldset>
                         </div>
                     }
 
@@ -141,8 +145,10 @@
                         <hr class="nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-4" />
 
                         <div class="nhsuk-grid-row">
-                            <div class="nhsuk-grid-column-full">
-                                <h4>Filter by provider:</h4>
+                            <fieldset class="nhsuk-grid-column-full">
+                                <legend>
+                                    <h2>Filter by provider:</h2>
+                                </legend>
 
                                 <div class="nhsuk-checkboxes">
                                     @foreach (var filter in resourceResult.SearchProviderFilters)
@@ -159,15 +165,17 @@
                                         </div>
                                     }
                                 </div>
-                            </div>
+                            </fieldset>
                         </div>
                     }
 
                     <hr class="nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-4" />
 
                     <div class="nhsuk-grid-row">
-                        <div class="nhsuk-grid-column-full">
-                            <h4>Filter by:</h4>
+                        <fieldset class="nhsuk-grid-column-full">
+                            <legend>
+                                <h2>Filter by:</h2>
+                            </legend>
 
                             <div class="nhsuk-checkboxes">
                                 @foreach (var filter in resourceResult.SearchFilters)
@@ -185,7 +193,7 @@
                                 }
 
                             </div>
-                        </div>
+                        </fieldset>
                     </div>
 
                     <button class="nhsuk-button nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-0" data-module="nhsuk-button" type="submit">
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
index 6e0f806bd..f5eac8b6c 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
@@ -82,7 +82,7 @@
     <div class="resource-author">
       @if (!string.IsNullOrWhiteSpace(item.CatalogueBadgeUrl) && showCatalogueFieldsInResources)
       {
-        <img class="resource-catalogue-badge" src="/search/image/@item.CatalogueBadgeUrl" alt="Resource catalog badge"/>
+        <img class="resource-catalogue-badge" src="/search/image/@item.CatalogueBadgeUrl" alt="Provider's catalogue badge"/>
       }
 
       @if (!string.IsNullOrEmpty(item.CatalogueName) && !this.Model.CatalogueId.HasValue && showCatalogueFieldsInResources)
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_SearchBar.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_SearchBar.cshtml
index 961f9c1aa..620d6cb76 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_SearchBar.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_SearchBar.cshtml
@@ -5,9 +5,7 @@
         <label class="nhsuk-label nhsuk-u-visually-hidden" for="sub-search-field">Search the learning hub</label>
         <input class="nhsuk-input nhsuk-search__input" type="search" name="term" autocomplete="off" id="sub-search-field" placeholder="Search the learning hub" value="@Model">
         <button class="nhsuk-search__submit" type="submit">
-            <span class="nhsuk-u-visually-hidden">
-                Submit
-            </span>
+            <span class="nhsuk-u-visually-hidden">Search</span>
             <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
                 <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
             </svg>
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_AudioVideoUnavailable.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_AudioVideoUnavailable.cshtml
index b8e71596e..e7aa7a412 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_AudioVideoUnavailable.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_AudioVideoUnavailable.cshtml
@@ -2,8 +2,8 @@
     <h3 class="nhsuk-warning-callout__label">
         <span role="text">
             <span class="nhsuk-u-visually-hidden">Important: </span>
-            Video and audio unavailable
+            Media services unavailable
         </span>
     </h3>
-    <p>The video and audio upload and streaming services on the Learning Hub platform are temporarily unavailable. We are working to resolve this as quickly as possible.</p>
+    <p>The Learning Hub's media upload and streaming services are temporarily unavailable. This will affect most video and audio uploads and playback. We are working to resolve this as quickly as possible.</p>
 </div>
diff --git a/WebAPI/LearningHub.Nhs.API/appsettings.json b/WebAPI/LearningHub.Nhs.API/appsettings.json
index 238d75f7e..6b95e1a2f 100644
--- a/WebAPI/LearningHub.Nhs.API/appsettings.json
+++ b/WebAPI/LearningHub.Nhs.API/appsettings.json
@@ -84,17 +84,18 @@
     },
 
     "FindWise": {
-      "IndexUrl": "",
-      "SearchUrl": "",
-      "CollectionIds": {
-        "Resource": "",
-        "Catalogue": ""
-      },
-      "UrlSearchComponent": "rest/apps/HEE/searchers/{0}",
-      "UrlClickComponent": "rest/apps/HEE/searchers/hee/signals/hee/signal/click",
-      "Token": "",
-      "MaximumDescriptionLength": 150,
-      "IndexMethod": "/rest/v2/collections/{0}/documents"
+        "IndexUrl": "",
+        "SearchUrl": "",
+        "CollectionIds": {
+            "Resource": "",
+            "Catalogue": ""
+        },
+        "UrlSearchComponent": "rest/apps/HEE/searchers/{0}",
+        "UrlClickComponent": "rest/apps/HEE/searchers/hee/signals/hee/signal/click",
+        "Token": "",
+        "MaximumDescriptionLength": 150,
+        "IndexMethod": "/rest/v2/collections/{0}/documents",
+        "DescriptionLengthLimit": 3000
     },
     "Notifications": {
       "PublishResourceTimeToProcessInSec": 30,
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/FindwiseSettings.cs b/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/FindwiseSettings.cs
index 57d0a8fb2..c68ab9dd9 100644
--- a/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/FindwiseSettings.cs
+++ b/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/FindwiseSettings.cs
@@ -44,5 +44,10 @@ public class FindwiseSettings
         /// Gets or sets the collection ids.
         /// </summary>
         public FindwiseCollectionIdSettings CollectionIds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Description length limit.
+        /// </summary>
+        public int DescriptionLengthLimit { get; set; }
     }
 }
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql
index a5a351969..1e83fc9b8 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql	
@@ -6,6 +6,8 @@
 --
 -- Modification History
 -- Sarathlal	20-02-2024
+-- Sarathlal	23-04-2024 TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
+-- Sarathlal	25-04-2024 TD-4067: Resource with muliple version issue resolved
 -------------------------------------------------------------------------------
 
 CREATE PROCEDURE [activity].[GetUserLatestActivityCheck] (
@@ -16,7 +18,7 @@ AS
 BEGIN
 	SELECT 
 	--Resource activity starts here
-	[t2].[Id] as Id,[t2].[UserId] as UserId,[t7].[ResourceId] as ResourceId,[t2].[ResourceVersionId] as ResourceVersionId,[t7].[NodePathId],[t2].[AmendDate],[t2].[Deleted],[t2].[CreateUserId],[t2].[CreateDate],[t2].[AmendUserId]
+	[t2].[Id] as Id,[t2].[UserId] as UserId,[t7].[ResourceId] as ResourceId,[t2].[ResourceVersionId] as ResourceVersionId,[t2].[NodePathId],[t2].[AmendDate],[t2].[Deleted],[t2].[CreateUserId],[t2].[CreateDate],[t2].[AmendUserId]
 	,[t2].[LaunchResourceActivityId],[t2].[MajorVersion],[t2].[MinorVersion],[t2].[ActivityStatusId],[t2].[ActivityStart],[t2].[ActivityEnd],[t9].[DurationSeconds],[t2].[Score]
 	--Node path clumns starts here
 	,[t6].[AmendDate] as NodePath_AmendDate,[t6].[AmendUserId] as NodePath_AmendUserId,[t6].[CatalogueNodeId] as NodePath_CatalogueNode, [t6].[CreateDate] as NodePath_CreateDate, [t6].[CreateUserId] as NodePath_CreateUserId, [t6].[Deleted] as NodePath_Deleted, [t6].[IsActive] as NodePath_IsActive
@@ -149,10 +151,10 @@ FROM (
 				(
 					(
 					   -- resource type is not video/audio and launch resource activity doesn't exists
-					   [Res].[ResourceTypeId] NOT IN (7,2) AND NOT (EXISTS
+					   NOT (EXISTS
 								(
 									SELECT 1 FROM   [activity].[ResourceActivity] AS [ResAct1]
-									WHERE  [ResAct1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct1].[LaunchResourceActivityId]
+									WHERE  [ResAct1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct1].[LaunchResourceActivityId] 
 								))
 					)
 				OR  
@@ -160,14 +162,14 @@ FROM (
 					EXISTS
 					(
 							SELECT 1	FROM   [activity].[ResourceActivity] AS [ResAct2]
-							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] = 3
+							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] in (3,7,5,4)
 					)
 					
 				)
-		AND
+			AND
 				(
-					-- resource type is not assessment and activity status is launched
-					[Res].[ResourceTypeId] <> 11 OR [ResourceActivity].[ActivityStatusId] = 1
+					-- resource type is not assessment and activity status is Complete/Incomplete
+					[Res].[ResourceTypeId] <> 11 OR [ResourceActivity].[ActivityStatusId] in (7,3)
 				)
 
 ) AS [t2]
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql
index def1b45e4..c96931937 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
@@ -7,7 +7,9 @@
 -- Modification History
 
 -- Sarathlal	14-12-2023
--- Sarathlal	08-03-2023
+-- Sarathlal	08-03-2024
+-- Sarathlal	23-04-2024 TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
+-- Sarathlal	25-04-2024 TD-4067: Resource with muliple version issue resolved
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [activity].[GetUserLearningActivities] (
 	 @userId INT	
@@ -56,7 +58,7 @@ BEGIN
 
 	SELECT 
 	--Resource activity starts here
-	[t2].[Id] as Id,[t2].[UserId] as UserId,[t7].[ResourceId] as ResourceId,[t2].[ResourceVersionId] as ResourceVersionId,[t7].[NodePathId],[t2].[AmendDate],[t2].[Deleted],[t2].[CreateUserId],[t2].[CreateDate],[t2].[AmendUserId]
+	[t2].[Id] as Id,[t2].[UserId] as UserId,[t7].[ResourceId] as ResourceId,[t2].[ResourceVersionId] as ResourceVersionId,[t2].[NodePathId],[t2].[AmendDate],[t2].[Deleted],[t2].[CreateUserId],[t2].[CreateDate],[t2].[AmendUserId]
 	,[t2].[LaunchResourceActivityId],[t2].[MajorVersion],[t2].[MinorVersion],[t2].[ActivityStatusId],[t2].[ActivityStart],[t2].[ActivityEnd],[t9].[DurationSeconds],[t2].[Score]
 	--Node path clumns starts here
 	,[t6].[AmendDate] as NodePath_AmendDate,[t6].[AmendUserId] as NodePath_AmendUserId,[t6].[CatalogueNodeId] as NodePath_CatalogueNode, [t6].[CreateDate] as NodePath_CreateDate, [t6].[CreateUserId] as NodePath_CreateUserId, [t6].[Deleted] as NodePath_Deleted, [t6].[IsActive] as NodePath_IsActive
@@ -173,7 +175,7 @@ FROM (
 			@searchText IS NULL
             OR 
 				(
-						Charindex(@searchText, [ResVer].[Title]) > 0
+						(Charindex(@searchText, [ResVer].[Title]) > 0
 					OR                          
 						Charindex(@searchText, [ResVer].[Description]) > 0
 					OR  
@@ -187,8 +189,8 @@ FROM (
 									[ResVer].[Id] = [ResourceVersionKeyword].[ResourceVersionId]
 								AND   
 									Charindex(@searchText, [ResourceVersionKeyword].[Keyword]) > 0
-								)
-					)
+								) 
+					)) AND [ResourceActivity].ActivityStart is not null 
 				)
 		)
 		AND
@@ -217,10 +219,10 @@ FROM (
 				(
 					(
 					   -- resource type is not video/audio and launch resource activity doesn't exists
-					   [Res].[ResourceTypeId] NOT IN (7,2) AND NOT (EXISTS
+					   NOT (EXISTS
 								(
 									SELECT 1 FROM   [activity].[ResourceActivity] AS [ResAct1]
-									WHERE  [ResAct1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct1].[LaunchResourceActivityId]
+									WHERE  [ResAct1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct1].[LaunchResourceActivityId] 
 								))
 					)
 				OR  
@@ -228,14 +230,14 @@ FROM (
 					EXISTS
 					(
 							SELECT 1	FROM   [activity].[ResourceActivity] AS [ResAct2]
-							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] = 3
+							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] in (3,7,5,4)
 					)
 					
 				)
-		AND
+			AND
 				(
-					-- resource type is not assessment and activity status is launched
-					[Res].[ResourceTypeId] <> 11 OR [ResourceActivity].[ActivityStatusId] = 1
+					-- resource type is not assessment and activity status is Complete/Incomplete
+					[Res].[ResourceTypeId] <> 11 OR [ResourceActivity].[ActivityStatusId] in (7,3)
 				)
 		AND
 				(
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql
index 4bd7cf1d2..daa20e0e7 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
@@ -7,7 +7,8 @@
 -- Modification History
 
 -- Sarathlal	18-12-2023
--- Sarathlal	08-03-2023
+-- Sarathlal	08-03-2024
+-- Sarathlal	23-04-2024	TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [activity].[GetUserLearningActivitiesCount] (
 	 @userId INT	
@@ -89,7 +90,7 @@ FROM (
 			@searchText IS NULL
             OR 
 				(
-						Charindex(@searchText, [ResVer].[Title]) > 0
+						(Charindex(@searchText, [ResVer].[Title]) > 0
 					OR                          
 						Charindex(@searchText, [ResVer].[Description]) > 0
 					OR  
@@ -103,8 +104,8 @@ FROM (
 									[ResVer].[Id] = [ResourceVersionKeyword].[ResourceVersionId]
 								AND   
 									Charindex(@searchText, [ResourceVersionKeyword].[Keyword]) > 0
-								)
-					)
+								) 
+					)) AND [ResourceActivity].ActivityStart is not null 
 				)
 		)
 		AND
@@ -133,10 +134,10 @@ FROM (
 				(
 					(
 					   -- resource type is not video/audio and launch resource activity doesn't exists
-					   [Res].[ResourceTypeId] NOT IN (7,2) AND NOT (EXISTS
+					   NOT (EXISTS
 								(
 									SELECT 1 FROM   [activity].[ResourceActivity] AS [ResAct1]
-									WHERE  [ResAct1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct1].[LaunchResourceActivityId]
+									WHERE  [ResAct1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct1].[LaunchResourceActivityId] 
 								))
 					)
 				OR  
@@ -144,14 +145,14 @@ FROM (
 					EXISTS
 					(
 							SELECT 1	FROM   [activity].[ResourceActivity] AS [ResAct2]
-							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] = 3
+							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] in (3,7,5,4)
 					)
 					
 				)
-		AND
+			AND
 				(
-					-- resource type is not assessment and activity status is launched
-					[Res].[ResourceTypeId] <> 11 OR [ResourceActivity].[ActivityStatusId] = 1
+					-- resource type is not assessment and activity status is Complete/Incomplete
+					[Res].[ResourceTypeId] <> 11 OR [ResourceActivity].[ActivityStatusId] in (7,3)
 				)
 		AND   
 					(
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/ScormActivityComplete.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/ScormActivityComplete.sql
index 48258f338..c04238a5a 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/ScormActivityComplete.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/ScormActivityComplete.sql	
@@ -6,7 +6,7 @@
 -- Modification History
 --
 -- 11-06-2021  Killian Davies	Initial Revision
--- 22-03-2024  Sarathlal		TD-1325
+-- 17-04-2024  Swapna Abraham	Reverted TD-1325 changes
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [activity].[ScormActivityComplete]
 (
@@ -24,7 +24,7 @@ BEGIN
 	DECLARE @DurationSeconds int
 	DECLARE @ScormActivityDurationLimitHours int = 10 * 60 * 60
 	DECLARE @AmendDate datetimeoffset(7) = ISNULL(TODATETIMEOFFSET(DATEADD(mi, @UserTimezoneOffset, GETUTCDATE()), @UserTimezoneOffset), SYSDATETIMEOFFSET())
-	DECLARE @CmiCoreSessionTime NVARCHAR(MAX)
+
 	SELECT 
 		@ScormResourceActivityId = [ResourceActivityId],
 		@ActivityStatusId = CmiCoreLesson_status,
@@ -33,8 +33,7 @@ BEGIN
 							WHEN (activity.ScormTimeToSeconds(CmiCoreSession_time) >= @ScormActivityDurationLimitHours) THEN (@ScormActivityDurationLimitHours - 1)
 							ELSE activity.ScormTimeToSeconds(CmiCoreSession_time) 
 						   END,
-		@Score = CmiCoreScoreRaw,
-		@CmiCoreSessionTime = CmiCoreSession_time
+		@Score = CmiCoreScoreRaw
 	FROM 
 		activity.ScormActivity sa
 	INNER JOIN	
@@ -54,7 +53,7 @@ BEGIN
 	END
 
 	-- Validation ported from e-LfH: completed status requires duration > 0
-	IF ((@ActivityStatusId IN (3, 4, 5) AND @DurationSeconds > 0) OR (@ActivityStatusId=3 AND @CmiCoreSessionTime =''))
+	IF (@ActivityStatusId IN (3, 4, 5) AND @DurationSeconds > 0)
 	BEGIN TRY
 		BEGIN TRAN
 
@@ -123,4 +122,6 @@ BEGIN
 				,@ErrorState
 				);
 	END CATCH
-END
\ No newline at end of file
+END
+
+GO
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueUpdate.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueUpdate.sql
index fc5877024..a5662b40c 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueUpdate.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueUpdate.sql	
@@ -9,6 +9,7 @@
 -- 01-08-2023  Swapnamol Abraham Provided BY
 -- 11-08-2023  RS               Added CardImageUrl parameter
 -- 08-02-2024  SA               Added Previewer user group 
+-- 24-04-2024  SS               Changed Description size to max 
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [hierarchy].[CatalogueUpdate]
 (
@@ -19,7 +20,7 @@ CREATE PROCEDURE [hierarchy].[CatalogueUpdate]
 	@BannerUrl nvarchar(128),
 	@CertificateUrl nvarchar(128),
 	@Order int,
-	@Description nvarchar(4000),
+	@Description nvarchar(max),
 	@UserId int,
 	@Keywords nvarchar(max),
 	@CatalogueNodeVersionId int,
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql
index 194eb9dac..c794f8d89 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql	
@@ -17,6 +17,7 @@
 -- 08 Nov 2023  OA  Fixed latest resource activity entry selection(with updated logic for media activities) and  status check for incomplete assessment.
 -- 17 Jan 2024  SA  Changes to accomadate activity status changes
 -- 27 Feb 2024  SS  Fixed missing In progress resources in the My Accessed Learning tray issue
+-- 2 May 2024   SA  Fixed the issue on showing statuses on 'My accessed Learning' for resource type file
 -------------------------------------------------------------------------------
 
 CREATE PROCEDURE [resources].[GetDashboardResources]
@@ -237,8 +238,8 @@ BEGIN
 					 (r.ResourceTypeId IN (1, 5, 8, 9,10, 12) AND ra.ActivityStatusId <> 3)
 				    OR (r.ResourceTypeId IN (2, 7) AND (mar.Id IS NULL OR (mar.Id IS NOT NULL AND mar.PercentComplete < 100) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00'))
 					OR  (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status NOT IN (3, 5) AND (ra.ActivityStatusId NOT IN(3, 5))))
-					OR (r.ResourceTypeId IN (9) AND ra.ActivityStatusId NOT IN (6))
-					OR (r.ResourceTypeId = 11 AND ((ara.Id IS NOT NULL AND ara.score < arv.PassMark) OR ra.ActivityStatusId IN (1))) 
+					OR (r.ResourceTypeId IN (9) AND ra.ActivityStatusId NOT IN (3))
+					OR (r.ResourceTypeId = 11 AND ((ara.Id IS NOT NULL AND ara.score < arv.PassMark) OR ra.ActivityStatusId = 7)) 
 					)		
 				GROUP BY ra.ResourceId	
 				ORDER BY ResourceActivityId DESC
diff --git a/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs
index 1c3a96adb..46a7405fa 100644
--- a/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs
@@ -111,12 +111,11 @@ public IQueryable<ResourceActivity> GetByUserId(int userId)
                .ThenInclude(a => a.AssessmentResourceActivityInteractions)
                .Include(r => r.NodePath)
                .AsNoTracking()
-             .Where(r =>
-                      r.UserId == userId && r.ScormActivity.First().CmiCoreLessonStatus != (int)ActivityStatusEnum.Completed &&
-                     ((r.Resource.ResourceTypeEnum != ResourceTypeEnum.Video && r.Resource.ResourceTypeEnum != ResourceTypeEnum.Audio && !r.InverseLaunchResourceActivity.Any()) ||
-                        r.InverseLaunchResourceActivity.Any(y => y.ActivityStatusId == (int)ActivityStatusEnum.Completed)) &&
-                     (r.Resource.ResourceTypeEnum != ResourceTypeEnum.Assessment || r.ActivityStatusId == (int)ActivityStatusEnum.Launched))
-              .OrderByDescending(r => r.ActivityStart);
+               .Where(r =>
+                            r.UserId == userId && r.ScormActivity.First().CmiCoreLessonStatus != (int)ActivityStatusEnum.Completed &&
+                           ((!r.InverseLaunchResourceActivity.Any()) ||
+                              r.InverseLaunchResourceActivity.Any()))
+               .OrderByDescending(r => r.ActivityStart);
         }
 
         /// <summary>
@@ -503,12 +502,17 @@ private void BindResourceNestedData(List<MyLearningActivity> result)
                 i.Resource.Deleted = i.Resource_Deleted;
                 int resourceTypeId = i.Resource_ResourceTypeId;
                 i.Resource.ResourceTypeEnum = (ResourceTypeEnum)resourceTypeId;
-                ResourceReference resourceReference = new ResourceReference();
-                resourceReference.OriginalResourceReferenceId = i.ResourceReference_OriginalResourceReferenceId;
-                resourceReference.NodePathId = i.ResourceReference_NodePathId;
-                resourceReference.ResourceId = i.ResourceReference_ResourceId;
+                var resourceReferences = result.Where(x => x.Id == i.Id && x.ResourceVersionId == i.ResourceVersionId).ToList();
                 List<ResourceReference> resourceReferenceList = new List<ResourceReference>();
-                resourceReferenceList.Add(resourceReference);
+                foreach (var b in resourceReferences)
+                {
+                    ResourceReference resourceReference = new ResourceReference();
+                    resourceReference.OriginalResourceReferenceId = b.ResourceReference_OriginalResourceReferenceId;
+                    resourceReference.NodePathId = b.ResourceReference_NodePathId;
+                    resourceReference.ResourceId = b.ResourceReference_ResourceId;
+                    resourceReferenceList.Add(resourceReference);
+                }
+
                 i.Resource.ResourceReference = resourceReferenceList;
             });
         }
diff --git a/WebAPI/LearningHub.Nhs.Services/ActivityService.cs b/WebAPI/LearningHub.Nhs.Services/ActivityService.cs
index a5b89c8d4..e8e9972b3 100644
--- a/WebAPI/LearningHub.Nhs.Services/ActivityService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/ActivityService.cs
@@ -245,7 +245,11 @@ public async Task<LearningHubValidationResult> CreateAssessmentResourceActivity(
                 var assessmentResourceActivity = this.mapper.Map<AssessmentResourceActivity>(createAssessmentResourceActivityViewModel);
                 var resourceVersionId = (await this.resourceActivityRepository.GetByIdAsync(assessmentResourceActivity.ResourceActivityId)).ResourceVersionId;
                 var resourceType = await this.resourceVersionRepository.GetResourceType(resourceVersionId);
-                var numberAttempts = (await this.resourceActivityRepository.GetByUserId(userId).ToListAsync()).Count(r => r.ResourceVersionId == resourceVersionId);
+                var numberAttempts = this.resourceActivityRepository.GetByUserId(userId)
+                              .Where(x => x.ResourceVersionId == resourceVersionId)
+                              .SelectMany(x => x.AssessmentResourceActivity)
+                              .OrderByDescending(a => a.CreateDate)
+                              .ToList().Count();
                 var maxAttempts = (await this.assessmentResourceVersionRepository.GetByResourceVersionIdAsync(resourceVersionId)).MaximumAttempts;
                 if ((!maxAttempts.HasValue || numberAttempts <= maxAttempts ||
                      createAssessmentResourceActivityViewModel.ExtraAttemptReason != null)
@@ -358,7 +362,10 @@ public async Task<AssessmentResourceActivity> GetLatestAssessmentResourceActivit
         public int GetAttempts(int userId, int resourceVersionId)
         {
             return this.resourceActivityRepository.GetByUserId(userId)
-                .Count(x => x.ResourceVersionId == resourceVersionId);
+                .Where(x => x.ResourceVersionId == resourceVersionId)
+                .SelectMany(x => x.AssessmentResourceActivity)
+                .OrderByDescending(a => a.CreateDate)
+                .ToList().Count();
         }
 
         /// <summary>
@@ -793,8 +800,11 @@ private async Task<bool> UserHasAlreadyAnsweredQuestion(int userId, int assessme
         /// <returns>The task that resolves to true if the user has used up all attempts for a resource version.</returns>
         private async Task<bool> UserHasUsedAllAttempts(int userId, int resourceVersionId)
         {
-            var resourceActivities = await this.resourceActivityRepository.GetByUserId(userId).ToListAsync();
-            var numberAttempts = resourceActivities.Count(r => r.ResourceVersionId == resourceVersionId);
+            var numberAttempts = this.resourceActivityRepository.GetByUserId(userId)
+               .Where(x => x.ResourceVersionId == resourceVersionId)
+               .SelectMany(x => x.AssessmentResourceActivity)
+               .OrderByDescending(a => a.CreateDate)
+               .ToList().Count();
             var assessmentResourceActivity = await this.assessmentResourceVersionRepository.GetByResourceVersionIdAsync(resourceVersionId);
             var maxAttempts = assessmentResourceActivity.MaximumAttempts;
             return numberAttempts >= maxAttempts;
diff --git a/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs b/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs
index f9c26859d..d19885181 100644
--- a/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs
@@ -259,6 +259,11 @@ public async Task<LearningHubValidationResult> CreateCatalogueAsync(int userId,
             if (cnv != null)
             {
                 var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
+                if (searchModel.Description.Length > this.settings.Findwise.DescriptionLengthLimit)
+                {
+                    searchModel.Description = searchModel.Description.Substring(0, this.settings.Findwise.DescriptionLengthLimit - 4) + "</p>";
+                }
+
                 await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
             }
 
@@ -480,6 +485,11 @@ public async Task<LearningHubValidationResult> UpdateCatalogueAsync(int userId,
             if (cnv != null)
             {
                 var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
+                if (searchModel.Description.Length > this.settings.Findwise.DescriptionLengthLimit)
+                {
+                    searchModel.Description = searchModel.Description.Substring(0, this.settings.Findwise.DescriptionLengthLimit - 4) + "</p>";
+                }
+
                 await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
             }
 
@@ -568,6 +578,11 @@ public async Task<LearningHubValidationResult> ShowCatalogueAsync(int userId, in
             if (cnv != null)
             {
                 var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
+                if (searchModel.Description.Length > this.settings.Findwise.DescriptionLengthLimit)
+                {
+                    searchModel.Description = searchModel.Description.Substring(0, this.settings.Findwise.DescriptionLengthLimit - 4) + "</p>";
+                }
+
                 await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
             }
 
@@ -600,6 +615,11 @@ public async Task HideCatalogueAsync(int userId, int nodeId)
             if (cnv != null)
             {
                 var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
+                if (searchModel.Description.Length > this.settings.Findwise.DescriptionLengthLimit)
+                {
+                    searchModel.Description = searchModel.Description.Substring(0, this.settings.Findwise.DescriptionLengthLimit - 4) + "</p>";
+                }
+
                 await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
             }
         }
@@ -680,10 +700,13 @@ public async Task<bool> CanUserEditCatalogueAsync(int userId, int catalogueId)
         {
             var u = await this.userRepository.GetByIdIncludeRolesAsync(userId);
 
-            var ug = u.UserUserGroup.Where(uug => uug.UserGroup.RoleUserGroup.Where(rug => rug.Scope != null && rug.Scope.CatalogueNodeId == catalogueId
-                                                                                            && (rug.RoleId == (int)RoleEnum.Editor)).ToList().Count > 0).ToList();
+            if (u != null)
+            {
+                var ug = u.UserUserGroup.Where(uug => uug.UserGroup.RoleUserGroup.Where(rug => rug.Scope != null && rug.Scope.CatalogueNodeId == catalogueId && (rug.RoleId == (int)RoleEnum.Editor)).ToList().Count > 0).ToList();
+                return ug.Count > 0;
+            }
 
-            return ug.Count > 0;
+            return false;
         }
 
         /// <summary>
diff --git a/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs b/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
index de78a8738..9abbf2316 100644
--- a/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
@@ -166,7 +166,7 @@ public async Task<Tuple<int, MyLearningDetailedItemViewModel>> GetResourceCertif
             activityQuery = activityQuery.Where(x => x.Resource.ResourceReference.FirstOrDefault() != null && x.Resource.ResourceReference.Any(rr => rr.OriginalResourceReferenceId == resourceReferenceId));
             int totalNumberOfAccess = activityQuery.Count();
             var activityEntities = await activityQuery.OrderByDescending(x => x.Score).ThenByDescending(x => x.ActivityStart).ToListAsync();
-            activityEntities.RemoveAll(x => x.Resource.ResourceTypeEnum == ResourceTypeEnum.Scorm && (x.ActivityStatusId == (int)ActivityStatusEnum.Downloaded || x.ActivityStatusId == (int)ActivityStatusEnum.Launched || x.ActivityStatusId == (int)ActivityStatusEnum.InProgress));
+            activityEntities.RemoveAll(x => x.Resource.ResourceTypeEnum == ResourceTypeEnum.Scorm && (x.ActivityStatusId == (int)ActivityStatusEnum.Downloaded || x.ActivityStatusId == (int)ActivityStatusEnum.Incomplete || x.ActivityStatusId == (int)ActivityStatusEnum.InProgress));
             if (activityEntities.Any() && activityEntities.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Assessment)
             {
                 activityEntities = activityEntities.Where(x => x.AssessmentResourceActivity.FirstOrDefault() != null && x.AssessmentResourceActivity.FirstOrDefault().Score.HasValue && ((int)Math.Round(x.AssessmentResourceActivity.FirstOrDefault().Score.Value, MidpointRounding.AwayFromZero) >= x.ResourceVersion.AssessmentResourceVersion.PassMark)).ToList();
@@ -181,7 +181,7 @@ public async Task<Tuple<int, MyLearningDetailedItemViewModel>> GetResourceCertif
                 }
                 else
                 {
-                    filteredActivity = activityEntities.Where(x => x.ActivityStatusId == ((int)ActivityStatusEnum.Completed) || x.ActivityStatusId == ((int)ActivityStatusEnum.Launched) || x.ActivityStatusId == ((int)ActivityStatusEnum.Passed) || x.ActivityStatusId == ((int)ActivityStatusEnum.Downloaded)).OrderByDescending(x => x.ActivityStart).FirstOrDefault();
+                    filteredActivity = activityEntities.Where(x => x.ActivityStatusId == ((int)ActivityStatusEnum.Completed) || x.ActivityStatusId == ((int)ActivityStatusEnum.Incomplete) || x.ActivityStatusId == ((int)ActivityStatusEnum.Passed) || x.ActivityStatusId == ((int)ActivityStatusEnum.Downloaded)).OrderByDescending(x => x.ActivityStart).FirstOrDefault();
                 }
 
                 if (filteredActivity != null)
@@ -263,23 +263,16 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai
                 ResourceActivity expectedActivity = null;
                 if (resourceActivity.Resource.ResourceTypeEnum == ResourceTypeEnum.Audio || resourceActivity.Resource.ResourceTypeEnum == ResourceTypeEnum.Video)
                 {
-                    expectedActivity = latestActivityCheck.Where(x => x.Id == resourceActivity.Id && x.MediaResourceActivity != null && x.MediaResourceActivity.Any(x => x.PercentComplete == 100)).OrderByDescending(x => x.ActivityStart).FirstOrDefault();
+                    expectedActivity = latestActivityCheck.Where(x => x.LaunchResourceActivityId == resourceActivity.Id && resourceActivity.MediaResourceActivity != null && resourceActivity.MediaResourceActivity.Any(y => y.PercentComplete == 100)).OrderByDescending(y => y.ActivityStart).FirstOrDefault();
                 }
                 else
                 {
-                    expectedActivity = latestActivityCheck.Where(x => x.Id == resourceActivity.Id && (x.ActivityStatusId == ((int)ActivityStatusEnum.Completed) || x.ActivityStatusId == ((int)ActivityStatusEnum.Launched) || x.ActivityStatusId == ((int)ActivityStatusEnum.Passed) || x.ActivityStatusId == ((int)ActivityStatusEnum.Downloaded))).OrderByDescending(x => x.ActivityStart).FirstOrDefault();
+                    expectedActivity = latestActivityCheck.Where(x => x.Id == resourceActivity.Id && (x.ActivityStatusId == ((int)ActivityStatusEnum.Completed) || x.ActivityStatusId == ((int)ActivityStatusEnum.Incomplete) || x.ActivityStatusId == ((int)ActivityStatusEnum.Passed) || x.ActivityStatusId == ((int)ActivityStatusEnum.Downloaded))).OrderByDescending(x => x.ActivityStart).FirstOrDefault();
                 }
 
-                if (latestActivityCheck.Any() && expectedActivity != null)
+                if (latestActivityCheck.Any() && expectedActivity != null && resourceActivity.ResourceVersion.CertificateEnabled == true)
                 {
-                    if (latestActivityCheck.OrderByDescending(x => x.ActivityStart).FirstOrDefault().Id == expectedActivity.Id)
-                    {
-                        viewModel.CertificateEnabled = resourceActivity.ResourceVersion.CertificateEnabled.GetValueOrDefault(false);
-                    }
-                    else
-                    {
-                        viewModel.CertificateEnabled = false;
-                    }
+                        viewModel.CertificateEnabled = true;
                 }
                 else
                 {
diff --git a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
index 69663fcc7..7c7974798 100644
--- a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
@@ -1390,7 +1390,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                 }
                 else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Audio)
                 {
-                    if (resource.AudioDetails.File.FilePath != extendedResourceVersion.AudioDetails.File.FilePath)
+                    if (resource.AudioDetails?.File?.FilePath != extendedResourceVersion.AudioDetails.File.FilePath)
                     {
                         if (!deletedResource)
                         {
@@ -1402,7 +1402,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                         }
                     }
 
-                    if (resource.AudioDetails.ResourceAzureMediaAsset.FilePath != extendedResourceVersion.AudioDetails.ResourceAzureMediaAsset.FilePath)
+                    if (resource.AudioDetails?.ResourceAzureMediaAsset?.FilePath != extendedResourceVersion.AudioDetails.ResourceAzureMediaAsset.FilePath)
                     {
                         if (!deletedResource)
                         {
@@ -1416,7 +1416,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                 }
                 else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Video)
                 {
-                    if (resource.VideoDetails.File.FilePath != extendedResourceVersion.VideoDetails.File.FilePath)
+                    if (resource.VideoDetails?.File?.FilePath != extendedResourceVersion.VideoDetails.File.FilePath)
                     {
                         if (!deletedResource)
                         {
@@ -1428,7 +1428,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                         }
                     }
 
-                    if (resource.VideoDetails.ResourceAzureMediaAsset.FilePath != extendedResourceVersion.VideoDetails.ResourceAzureMediaAsset.FilePath)
+                    if (resource.VideoDetails?.ResourceAzureMediaAsset?.FilePath != extendedResourceVersion.VideoDetails.ResourceAzureMediaAsset.FilePath)
                     {
                         if (!deletedResource)
                         {
@@ -1443,7 +1443,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                 else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Article)
                 {
                     var inputResourceFiles = resource.ArticleDetails.Files.ToList();
-                    var previousPublishedfiles = extendedResourceVersion.ArticleDetails.Files.ToList();
+                    var previousPublishedfiles = extendedResourceVersion.ArticleDetails?.Files?.ToList();
                     if (!deletedResource)
                     {
                         if (previousPublishedfiles.Any())
@@ -1471,6 +1471,117 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                         }
                     }
                 }
+                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Assessment)
+                {
+                    if (deletedResource)
+                    {
+                        if (resource.AssessmentDetails is { EndGuidance: { } } && resource.AssessmentDetails.EndGuidance.Blocks != null)
+                        {
+                            var assessmentFiles = this.CheckBlockFile(resource.AssessmentDetails.EndGuidance);
+                            if (assessmentFiles.Any())
+                            {
+                                retVal.AddRange(assessmentFiles);
+                            }
+                        }
+
+                        if (resource.AssessmentDetails is { AssessmentContent: { } } && resource.AssessmentDetails.AssessmentContent.Blocks != null)
+                        {
+                            var assessmentFiles = this.CheckBlockFile(resource.AssessmentDetails.AssessmentContent);
+                            if (assessmentFiles.Any())
+                            {
+                                retVal.AddRange(assessmentFiles);
+                            }
+                        }
+                    }
+                }
+                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Case)
+                {
+                    if (deletedResource)
+                    {
+                        var caseFiles = this.CheckBlockFile(resource.CaseDetails.BlockCollection);
+                        if (caseFiles.Any())
+                        {
+                            retVal.AddRange(caseFiles);
+                        }
+                    }
+                }
+            }
+            else if (rv == null && deletedResource)
+            {
+                if (resource.ResourceTypeEnum == ResourceTypeEnum.Scorm)
+                {
+                      retVal.Add(resource.ScormDetails.ContentFilePath);
+                }
+                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Html)
+                {
+                      retVal.Add(resource.HtmlDetails.ContentFilePath);
+                }
+                else if (resource.ResourceTypeEnum == ResourceTypeEnum.GenericFile)
+                {
+                    retVal.Add(resource.GenericFileDetails.File.FilePath);
+                }
+                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Image)
+                {
+                    retVal.Add(resource.ImageDetails.File.FilePath);
+                }
+                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Audio)
+                {
+                    retVal.Add(resource.AudioDetails?.File?.FilePath);
+                    if (resource.AudioDetails?.ResourceAzureMediaAsset?.FilePath != null)
+                    {
+                            retVal.Add(resource.AudioDetails.ResourceAzureMediaAsset.FilePath);
+                    }
+                }
+                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Video)
+                {
+                    retVal.Add(resource.VideoDetails?.File?.FilePath);
+                    if (resource.VideoDetails?.ResourceAzureMediaAsset?.FilePath != null)
+                    {
+                         retVal.Add(resource.VideoDetails.ResourceAzureMediaAsset.FilePath);
+                    }
+                }
+                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Article)
+                {
+                        var inputResourceFiles = resource.ArticleDetails.Files.ToList();
+                        if (inputResourceFiles.Any())
+                        {
+                            foreach (var file in inputResourceFiles)
+                            {
+                                    retVal.Add(file.FilePath);
+                            }
+                        }
+                    }
+                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Assessment)
+                {
+                    if (deletedResource)
+                    {
+                        if (resource.AssessmentDetails is { EndGuidance: { } } && resource.AssessmentDetails.EndGuidance.Blocks != null)
+                        {
+                            var assessmentFiles = this.CheckBlockFile(resource.AssessmentDetails.EndGuidance);
+                            if (assessmentFiles.Any())
+                            {
+                                retVal.AddRange(assessmentFiles);
+                            }
+                        }
+
+                        if (resource.AssessmentDetails is { AssessmentContent: { } } && resource.AssessmentDetails.AssessmentContent.Blocks != null)
+                        {
+                            var assessmentFiles = this.CheckBlockFile(resource.AssessmentDetails.AssessmentContent);
+                            if (assessmentFiles.Any())
+                            {
+                                retVal.AddRange(assessmentFiles);
+                            }
+                        }
+                    }
+                }
+                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Case)
+                {
+                    var caseFiles = this.CheckBlockFile(resource.CaseDetails.BlockCollection);
+                    if (caseFiles.Any())
+                    {
+                        retVal.AddRange(caseFiles);
+                    }
+                }
             }
 
             return retVal;
@@ -4772,5 +4883,201 @@ private async Task<int> CreateNewResource(ResourceTypeEnum resourceType, string
 
             return resourceVersionId;
         }
+
+        private List<string> CheckBlockFile(BlockCollectionViewModel model)
+        {
+            var retVal = new List<string>();
+            var caseBlockCollection = model;
+            if (caseBlockCollection != null)
+            {
+                var allBlocks = caseBlockCollection.Blocks.ToList();
+                if (allBlocks.Any())
+                {
+                    var existingAttachements = allBlocks.Where(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Attachment && x.MediaBlock.Attachment != null).ToList();
+                    if (existingAttachements.Any())
+                    {
+                        foreach (var oldblock in existingAttachements)
+                        {
+                            retVal.Add(oldblock.MediaBlock.Attachment?.File?.FilePath);
+                        }
+                    }
+
+                    var existingVideos = allBlocks.Where(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Video && x.MediaBlock.Video != null).ToList();
+                    if (existingVideos.Any())
+                    {
+                        foreach (var oldblock in existingVideos)
+                        {
+                            if (!string.IsNullOrWhiteSpace(oldblock.MediaBlock.Video.File.FilePath))
+                            {
+                                retVal.Add(oldblock.MediaBlock.Video.File.FilePath);
+                            }
+
+                            if (!string.IsNullOrWhiteSpace(oldblock.MediaBlock.Video?.File?.VideoFile?.File?.FilePath))
+                            {
+                                retVal.Add(oldblock.MediaBlock.Video.File.VideoFile.File.FilePath);
+                            }
+
+                            if (oldblock.MediaBlock?.Video?.File?.VideoFile?.TranscriptFile?.File?.FilePath != null)
+                            {
+                                retVal.Add(oldblock.MediaBlock.Video.File.VideoFile.TranscriptFile.File.FilePath);
+                            }
+                        }
+                    }
+
+                    var existingImages = allBlocks.Where(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Image && x.MediaBlock.Image != null).ToList();
+                    if (existingImages.Any())
+                    {
+                        foreach (var oldblock in existingImages)
+                        {
+                            retVal.Add(oldblock.MediaBlock?.Image?.File?.FilePath);
+                        }
+                    }
+
+                    var existingImageCarousel = allBlocks.Where(x => x.BlockType == BlockType.ImageCarousel && x.ImageCarouselBlock != null && x.ImageCarouselBlock.ImageBlockCollection != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks != null).ToList();
+                    if (existingImageCarousel.Any())
+                    {
+                        foreach (var imageBlock in existingImageCarousel)
+                        {
+                            foreach (var oldblock in imageBlock.ImageCarouselBlock.ImageBlockCollection.Blocks)
+                            {
+                                retVal.Add(oldblock.MediaBlock?.Image?.File?.FilePath);
+                            }
+                        }
+                    }
+
+                    var existingWholeSlideImages = allBlocks.Where(x => x.WholeSlideImageBlock != null && x.WholeSlideImageBlock.WholeSlideImageBlockItems.Any()).ToList();
+                    if (existingWholeSlideImages.Any())
+                    {
+                        foreach (var wsi in existingWholeSlideImages)
+                        {
+                            foreach (var oldblock in wsi?.WholeSlideImageBlock?.WholeSlideImageBlockItems)
+                            {
+                                retVal.Add(oldblock.WholeSlideImage?.File?.FilePath);
+                            }
+                        }
+                    }
+                }
+
+                var questionFiles = this.CheckQuestionBlock(caseBlockCollection);
+                if (questionFiles.Any())
+                {
+                    retVal.AddRange(questionFiles);
+                }
+            }
+
+            return retVal;
+        }
+
+        private List<string> CheckQuestionBlock(BlockCollectionViewModel model)
+        {
+            var filePath = new List<string>();
+            foreach (var block in model.Blocks)
+            {
+                if (block.BlockType == BlockType.Question && block.QuestionBlock != null)
+                {
+                    if (block.QuestionBlock.QuestionType == QuestionTypeEnum.MatchGame && block.QuestionBlock.Answers != null)
+                    {
+                        foreach (var answerBlock in block.QuestionBlock.Answers)
+                        {
+                            if (answerBlock.BlockCollection != null && answerBlock.BlockCollection.Blocks != null)
+                            {
+                                foreach (var imageBlock in answerBlock.BlockCollection.Blocks)
+                                {
+                                    if (imageBlock.BlockType == BlockType.Media && imageBlock.MediaBlock != null)
+                                    {
+                                        filePath.Add(imageBlock.MediaBlock.Image.File.FilePath);
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    var questionBlockCollection = block.QuestionBlock.QuestionBlockCollection;
+                    if (questionBlockCollection != null && questionBlockCollection.Blocks != null)
+                    {
+                        foreach (var questionBlock in questionBlockCollection.Blocks)
+                        {
+                            if (questionBlock.BlockType == BlockType.Media && questionBlock.MediaBlock != null)
+                            {
+                                if (questionBlock.MediaBlock.Image != null)
+                                {
+                                    filePath.Add(questionBlock.MediaBlock.Image.File.FilePath);
+                                }
+
+                                if (questionBlock.MediaBlock.Video != null)
+                                {
+                                    if (questionBlock.MediaBlock.Video.File != null)
+                                    {
+                                        filePath.Add(questionBlock.MediaBlock.Video.File.FilePath);
+                                    }
+
+                                    if (questionBlock.MediaBlock.Video.VideoFile != null)
+                                    {
+                                        if (questionBlock.MediaBlock.Video.VideoFile.TranscriptFile != null)
+                                        {
+                                            filePath.Add(questionBlock.MediaBlock.Video.VideoFile.TranscriptFile.File.FilePath);
+                                        }
+
+                                        if (questionBlock.MediaBlock.Video.VideoFile.CaptionsFile != null)
+                                        {
+                                            filePath.Add(questionBlock.MediaBlock.Video.VideoFile.CaptionsFile.File.FilePath);
+                                        }
+                                    }
+                                }
+                            }
+                            else if (questionBlock.BlockType == BlockType.WholeSlideImage && questionBlock.WholeSlideImageBlock != null)
+                            {
+                                var existingWholeSlideImages = questionBlock.WholeSlideImageBlock.WholeSlideImageBlockItems.ToList();
+                                if (existingWholeSlideImages.Any())
+                                {
+                                    foreach (var wsi in existingWholeSlideImages)
+                                    {
+                                        filePath.Add(wsi.WholeSlideImage?.File?.FilePath);
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    var feedbackBlockCollection = block.QuestionBlock.FeedbackBlockCollection;
+                    if (feedbackBlockCollection != null && feedbackBlockCollection.Blocks != null)
+                    {
+                        foreach (var feedbackBlock in feedbackBlockCollection.Blocks)
+                        {
+                            if (feedbackBlock.BlockType == BlockType.Media && feedbackBlock.MediaBlock != null)
+                            {
+                                if (feedbackBlock.MediaBlock.Image != null)
+                                {
+                                    filePath.Add(feedbackBlock.MediaBlock.Image.File.FilePath);
+                                }
+
+                                if (feedbackBlock.MediaBlock.Video != null)
+                                {
+                                    if (feedbackBlock.MediaBlock.Video.File != null)
+                                    {
+                                        filePath.Add(feedbackBlock.MediaBlock.Video.File.FilePath);
+                                    }
+
+                                    if (feedbackBlock.MediaBlock.Video.VideoFile != null)
+                                    {
+                                        if (feedbackBlock.MediaBlock.Video.VideoFile.TranscriptFile != null)
+                                        {
+                                            filePath.Add(feedbackBlock.MediaBlock.Video.VideoFile.TranscriptFile.File.FilePath);
+                                        }
+
+                                        if (feedbackBlock.MediaBlock.Video.VideoFile.CaptionsFile != null)
+                                        {
+                                            filePath.Add(feedbackBlock.MediaBlock.Video.VideoFile.CaptionsFile.File.FilePath);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return filePath;
+        }
     }
 }
\ No newline at end of file