IMDI: Corpus Form Template Handling Improved