Don't write cols tag when it donesn't exist
Fix Fill tags