[#87976] Refactor journal row creation, validation