Fixes BH-23 and fixed the submissionList which had an error