After rewrite of canonicalization, some rewrite of the index structure