Ensure empty attributes values are not mapped