Drop the composite_index in favor of a multi-column unique index