CAAERS-7046 - few issues with legacy submissions.