In #1869 one fix of the problematic schema parts was done in the newly introduced and not yet released database schema.
It should be fixed at other places in the schema too.