     privacy_features map<text, text>,
     tags list<frozen<resource_tag>>,
     title text,
-    PRIMARY KEY (contact_id, user_id)
-) WITH CLUSTERING ORDER BY (user_id ASC)
+    PRIMARY KEY (user_id, contact_id)
+) WITH CLUSTERING ORDER BY (contact_id ASC)
     AND bloom_filter_fp_chance = 0.01
     AND caching = '{"keys":"ALL","rows_per_partition":"ALL"}'
     AND comment = ''

    AND min_index_interval = 128
    AND read_repair_chance = 0.0
    AND speculative_retry = '99.0PERCENTILE';

    AND speculative_retry = '99.0PERCENTILE';

CREATE TABLE caliopen.contact (
    user_id uuid,
    contact_id uuid,
    additional_name text,
    addresses list<frozen<postal_address>>,
    avatar text,
