Fixing "broken" handlers
Adding blank fields to the printable form