Fix malform records on mapper side