VID-96 adding edit case handling