Fix handling of composite unique_key in incremental models