Fix form_zip function wrt key consistency