Move map format fix-up to validation filter and add error message #1310