Fix matrix file names in code; fix repeated validation questions bug (it is necessary to make the validation pairs have distinct ids).