Merge #42: Correction WRTE handler and rewrite 'Catalog' table