Fix schema processing
Fix merge records