diff --git a/web/thesauruses/ada/2012/lists.json b/web/thesauruses/ada/2012/lists.json
index e18efe18..b156d106 100644
--- a/web/thesauruses/ada/2012/lists.json
+++ b/web/thesauruses/ada/2012/lists.json
@@ -60,13 +60,54 @@
       "not-implemented": "true",
       "name": "Delete the list"
     },
-    "name_of_unordered_mutable_list": {
+    "name_of_sorted_mutable_list": {
       "code": "sets",
-      "name": "What is a unordered mutable list called?"
+      "name": "What is a sorted mutable list called?"
     },
-    "create_a_unordered_mutable_list": {
+    "create_a_sorted_mutable_list": {
       "code": "S : Set;",
       "comment": "Ad.Containers.Ordered_Sets container is required",
+      "name": "Create the list"
+    },
+    "sorted_mutable_list_start_number": {
+      "not-implemented": "true",
+      "name": "What number does it start at?"
+    },
+    "access_element_in_sorted_mutable_list": {
+      "not-implemented": "true",
+      "name": "Access element by index"
+    },
+    "insert_into_sorted_mutable_list": {
+      "code": "S.Include (value); \n S.Insert (value);",
+      "comment": "S.Insert(value) raises Constraint_Error if value appended is already in the list",
+      "name": "Insert element in middle"
+    },
+    "erase_element_at_beginning_of_sorted_mutable_list": {
+      "not-implemented": "true",
+      "name": "Erase first element"
+    },
+    "erase_element_at_end_of_sorted_mutable_list": {
+      "not-implemented": "true",
+      "name": "Erase last element"
+    },
+    "erase_element_in_middle_of_sorted_mutable_list": {
+      "not-implemented": "true",
+      "name": "Erase element in the middle"
+    },
+    "swap_elements_in_sorted_mutable_list": {
+      "not-implemented": "true",
+      "name": "Swap two elements"
+    },
+    "delete_sorted_mutable_list": {
+      "not-implemented": "true",
+      "name": "Delete the list"
+    },
+    "name_of_unordered_mutable_list": {
+      "not-implemented": "true",
+      "name": "What is a unordered mutable list called?"
+    },
+    "create_a_unordered_mutable_list": {
+      "not-implemented": "true",
       "name": "unordered"
     },
     "unordered_mutable_list_start_number": {
@@ -78,9 +119,8 @@
       "name": "Access element by index"
     },
     "insert_into_unordered_mutable_list": {
-      "code": "S.Include (value); \n S.Insert (value);",
-      "comment": "S.Insert(value) raises Constraint_Error if value appended is already in the list",
-      "name": "Insert element at end"
+      "not-implemented": "true",
+      "name": "Insert element in middle"
     },
     "erase_element_at_beginning_of_unordered_mutable_list": {
       "not-implemented": "true",
diff --git a/web/thesauruses/haskell/2010/lists.json b/web/thesauruses/haskell/2010/lists.json
index e7d024e2..e2daff8f 100644
--- a/web/thesauruses/haskell/2010/lists.json
+++ b/web/thesauruses/haskell/2010/lists.json
@@ -95,19 +95,20 @@
       "name": "Delete the list"
     },
     "name_of_ordered_immutable_list": {
-      "not-implemented": true,
+      "comment": "`a` is the type of elements of the list",
+      "code": "[a]",
       "name": "What is a ordered immutable list called?"
     },
     "create_a_ordered_immutable_list": {
-      "not-implemented": true,
+      "code": "[firstElement, secondElement]",
       "name": "Create the list"
     },
     "ordered_immutable_list_start_number": {
-      "not-implemented": true,
+      "code": "0",
       "name": "What number does it start at?"
     },
     "access_element_in_ordered_immutable_list": {
-      "not-implemented": true,
+      "code": "list !! index",
       "name": "Access element by index"
     },
     "delete_ordered_immutable_list": {
@@ -115,20 +116,19 @@
       "name": "Delete the list"
     },
     "name_of_unordered_immutable_list": {
-      "comment": "`a` is the type of elements of the list",
-      "code": "[a]",
+      "not-implemented": true,
       "name": "What is a unordered immutable list called?"
     },
     "create_a_unordered_immutable_list": {
-      "code": "[firstElement, secondElement]",
+      "not-implemented": true,
       "name": "Create the list"
     },
     "unordered_immutable_list_start_number": {
-      "code": "0",
+      "not-implemented": true,
       "name": "What number does it start at?"
     },
     "access_element_in_unordered_immutable_list": {
-      "code": "list !! index",
+      "not-implemented": true,
       "name": "Access element by index"
     },
     "delete_unordered_immutable_list": {
diff --git a/web/thesauruses/nim/1/lists.json b/web/thesauruses/nim/1/lists.json
index 59fb0367..4eab409e 100644
--- a/web/thesauruses/nim/1/lists.json
+++ b/web/thesauruses/nim/1/lists.json
@@ -56,43 +56,43 @@
     },
     "name_of_unordered_mutable_list": {
       "name": "What is a unordered, mutable list called?",
-      "code": "Table"
+      "not-implemented": true
     },
     "create_a_unordered_mutable_list": {
       "name": "unordered",
-      "code": "{\"key\": \"value\"}.toTable"
+      "not-implemented": true
     },
     "unordered_mutable_list_start_number": {
       "name": "What number does it start at?",
-      "code": "0"
+      "not-implemented": true
     },
     "access_element_in_unordered_mutable_list": {
       "name": "Access element by index",
-      "code": "table[key]"
+      "not-implemented": true
     },
     "insert_into_unordered_mutable_list": {
       "name": "Insert element in middle",
-      "code": "table[key] = value"
+      "not-implemented": true
     },
     "erase_element_at_beginning_of_unordered_mutable_list": {
       "name": "Erase first element",
-      "code": "table.del key"
+      "not-implemented": true
     },
     "erase_element_at_end_of_unordered_mutable_list": {
       "name": "Erase last element",
-      "code": "table.del key"
+      "not-implemented": true
     },
     "erase_element_in_middle_of_unordered_mutable_list": {
       "name": "Erase element in the middle",
-      "code": "table.del key"
+      "not-implemented": true
     },
     "swap_elements_in_unordered_mutable_list": {
       "name": "Swap two elements",
-      "code": "swap table[key0], table[key1]"
+      "not-implemented": true
     },
     "delete_unordered_mutable_list": {
       "name": "Delete the list",
-      "code": "Automatic compile-time deterministic memory management"
+      "not-implemented": true
     },
     "name_of_ordered_immutable_list": {
       "name": "What is a ordered, immutable list called?",
@@ -116,39 +116,39 @@
     },
     "name_of_unordered_immutable_list": {
       "name": "What is a unordered, immutable list called?",
-      "code": "Table"
+      "not-implemented": true
     },
     "create_a_unordered_immutable_list": {
       "name": "Create the list",
-      "code": "{\"key\": \"value\"}.toTable"
+      "not-implemented": true
     },
     "unordered_immutable_list_start_number": {
       "name": "What number does it start at?",
-      "code": "0"
+      "not-implemented": true
     },
     "access_element_in_unordered_immutable_list": {
       "name": "Access element by index",
-      "code": "table[key]"
+      "not-implemented": true
     },
     "delete_unordered_immutable_list": {
       "name": "Delete the list",
-      "code": "Automatic compile-time deterministic memory management"
+      "not-implemented": true
     },
     "name_of_mutable_hashed_list": {
       "name": "What is a mutable hashed list called?",
-      "code": "Table"
+      "code": "HashSet"
     },
     "create_a_mutable_hashed_list": {
       "name": "Create the list",
-      "code": "{\"key\": \"value\"}.toTable"
+      "code": "[1, 2].toHashSet"
     },
     "insert_element_to_mutable_hashed_list": {
       "name": "Insert an element",
-      "code": "table[key] = value"
+      "code": "hashset.incl item"
     },
     "erase_element_from_mutable_hashed_list": {
       "name": "Erase an element from the list",
-      "code": "table.del key"
+      "code": "hashset.excl item"
     },
     "delete_mutable_hashed_list": {
       "name": "Delete the list",
@@ -156,20 +156,68 @@
     },
     "name_of_immutable_hashed_list": {
       "name": "What is an immutable hashed list called?",
-      "code": "Table"
+      "code": "HashSet"
     },
     "create_a_immutable_hashed_list": {
       "name": "Create the list",
-      "code": "{\"key\": \"value\"}.toTable"
+      "code": "[1, 2].toHashSet"
     },
     "delete_immutable_hashed_list": {
       "name": "Delete the list",
       "code": "Automatic compile-time deterministic memory management"
     },
+    "create_a_mutable_set": {
+      "name": "Create a mutable key/value set",
+      "code": "{\"key\": \"value\"}.toTable"
+    },
+    "get_key_from_mutable_set": {
+      "name": "Get key",
+      "not-implemented": true
+    },
+    "get_value_from_mutable_set": {
+      "name": "Get value",
+      "code": "table[key]"
+    },
+    "get_all_keys_from_mutable_set": {
+      "name": "Get all keys",
+      "code": "toSeq(table.keys)"
+    },
+    "get_all_values_from_mutable_set": {
+      "name": "Get all values",
+      "code": "toSeq(table.values)"
+    },
+    "swap_key_and_value_in_mutable_set": {
+      "name": "Swap a key and value",
+      "not-implemented": true
+    },
     "delete_mutable_set": {
       "name": "Delete the set",
       "code": "Automatic compile-time deterministic memory management"
     },
+    "create_a_immutable_set": {
+      "name": "Create an immutable key/value set",
+      "code": "{\"key\": \"value\"}.toTable"
+    },
+    "get_key_from_immutable_set": {
+      "name": "Get key",
+      "not-implemented": true
+    },
+    "get_value_from_immutable_set": {
+      "name": "Get value",
+      "code": "table[key]"
+    },
+    "get_all_keys_from_immutable_set": {
+      "name": "Get all keys",
+      "code": "toSeq(table.keys)"
+    },
+    "get_all_values_from_immutable_set": {
+      "name": "Get all values",
+      "code": "toSeq(table.values)"
+    },
+    "swap_key_and_value_in_immutable_set": {
+      "name": "Swap a key and value",
+      "not-implemented": true
+    },
     "delete_immutable_set": {
       "name": "Delete the set",
       "code": "Automatic compile-time deterministic memory management"
diff --git a/web/thesauruses/objectivec/2/lists.json b/web/thesauruses/objectivec/2/lists.json
index 5f8878a0..95425aea 100644
--- a/web/thesauruses/objectivec/2/lists.json
+++ b/web/thesauruses/objectivec/2/lists.json
@@ -63,11 +63,11 @@
       "name": "Delete the list"
     },
     "name_of_unordered_mutable_list": {
-      "code": "NSMutableSet",
+      "not-implemented": "true",
       "name": "What is a unordered mutable list called?"
     },
     "create_a_unordered_mutable_list": {
-      "code": "NSMutableSet *set = [NSMutableSet setWithCapacity:2];NSLog(@\"%@\",set);",
+      "not-implemented": "true",
       "name": "unordered"
     },
     "unordered_mutable_list_start_number": {
@@ -123,11 +123,11 @@
       "name": "Delete the list"
     },
     "name_of_unordered_immutable_list": {
-      "code": "NSset",
+      "not-implemented": "true",
       "name": "What is a unordered immutable list called?"
     },
     "create_a_unordered_immutable_list": {
-      "code": "NSSet *set = [NSSet set];NSLog(@\"%@\",set);",
+      "not-implemented": "true",
       "name": "Create the list"
     },
     "unordered_immutable_list_start_number": {
@@ -143,31 +143,31 @@
       "name": "Delete the list"
     },
     "name_of_mutable_hashed_list": {
-      "code": "NSHashTable",
+      "code": "NSMutableSet",
       "name": "What is a mutable hashed list called?"
     },
     "create_a_mutable_hashed_list": {
-      "not-implemented": "true",
+      "code": "NSMutableSet *set = [NSMutableSet setWithCapacity:2];",
       "name": "Create the list"
     },
     "insert_element_to_mutable_hashed_list": {
-      "code": "add(_:)",
+      "code": "[set addObject:object];",
       "name": "Insert an element"
     },
     "erase_element_from_mutable_hashed_list": {
-      "code": "remove(_:)",
+      "code": "[set removeObject:object];",
       "name": "Erase an element from the list"
     },
     "delete_mutable_hashed_list": {
-      "code": "removeAllObjects()",
+      "code": "[set removeAllObjects];",
       "name": "Delete the list"
     },
     "name_of_immutable_hashed_list": {
-      "not-implemented": "true",
+      "code": "NSSet",
       "name": "What is an immutable hashed list called?"
     },
     "create_a_immutable_hashed_list": {
-      "not-implemented": "true",
+      "code": "NSSet *set = [NSSet setWithObjects:@\"a\", @\"b\", nil];",
       "name": "Create the list"
     },
     "delete_immutable_hashed_list": {
@@ -175,23 +175,23 @@
       "name": "Delete the list"
     },
     "create_a_mutable_set": {
-      "code": "NSMutableSet",
+      "code": "NSMutableDictionary *dict = [NSMutableDictionary dictionary];",
       "name": "Create a mutable key/value set"
     },
     "get_key_from_mutable_set": {
-      "not-implemented": "true",
+      "code": "[dict allKeysForObject:value]",
       "name": "Get key"
     },
     "get_value_from_mutable_set": {
-      "not-implemented": "true",
+      "code": "[dict objectForKey:key]",
       "name": "Get value"
     },
     "get_all_keys_from_mutable_set": {
-      "not-implemented": "true",
+      "code": "[dict allKeys]",
       "name": "Get all keys"
     },
     "get_all_values_from_mutable_set": {
-      "not-implemented": "true",
+      "code": "[dict allValues]",
       "name": "Get all values"
     },
     "swap_key_and_value_in_mutable_set": {
@@ -199,27 +199,27 @@
       "name": "Swap a key and value"
     },
     "delete_mutable_set": {
-      "code": "remove(_:)",
+      "code": "[dict removeAllObjects];",
       "name": "Delete the set"
     },
     "create_a_immutable_set": {
-      "not-implemented": "true",
+      "code": "NSDictionary *dict = @{@\"key\": @\"value\"};",
       "name": "Create an immutable key/value set"
     },
     "get_key_from_immutable_set": {
-      "not-implemented": "true",
+      "code": "[dict allKeysForObject:value]",
       "name": "Get key"
     },
     "get_value_from_immutable_set": {
-      "not-implemented": "true",
+      "code": "[dict objectForKey:key]",
       "name": "Get value"
     },
     "get_all_keys_from_immutable_set": {
-      "not-implemented": "true",
+      "code": "[dict allKeys]",
       "name": "Get all keys"
     },
     "get_all_values_from_immutable_set": {
-      "not-implemented": "true",
+      "code": "[dict allValues]",
       "name": "Get all values"
     },
     "swap_key_and_value_in_immutable_set": {
@@ -274,7 +274,7 @@
       "name": "Duplicate a portion/subset of a list"
     },
     "get_list_length": {
-      "code": "var count: Int { get }",
+      "code": "[myArray count]",
       "name": "Get list length"
     },
     "resize_list": {
diff --git a/web/thesauruses/swift/5/lists.json b/web/thesauruses/swift/5/lists.json
index fc90318e..3d8be292 100644
--- a/web/thesauruses/swift/5/lists.json
+++ b/web/thesauruses/swift/5/lists.json
@@ -57,39 +57,35 @@
       "name": "Delete the list"
     },
     "name_of_unordered_mutable_list": {
-      "code": "Dictionary<Key, Value>",
+      "not-implemented": "true",
       "name": "What is a unordered mutable list called?"
     },
     "create_a_unordered_mutable_list": {
-      "code": "var someList: [Int: String] = [:]",
+      "not-implemented": "true",
       "name": "unordered"
     },
     "unordered_mutable_list_start_number": {
       "not-implemented": "true",
-      "comment": "This operation is not necessary as the elements are accessed by the key",
       "name": "What number does it start at?"
     },
     "access_element_in_unordered_mutable_list": {
-      "code": "someList[26]",
+      "not-implemented": "true",
       "name": "Access element by index"
     },
     "insert_into_unordered_mutable_list": {
       "not-implemented": "true",
-      "comment": "This operation is not necessary as the elements are accessed by the key",
       "name": "Insert element in middle"
     },
     "erase_element_at_beginning_of_unordered_mutable_list": {
       "not-implemented": "true",
-      "comment": "This operation is not necessary as the elements are accessed by the key",
       "name": "Erase first element"
     },
     "erase_element_at_end_of_unordered_mutable_list": {
       "not-implemented": "true",
-      "comment": "This operation is not necessary as the elements are accessed by the key",
       "name": "Erase last element"
     },
     "erase_element_in_middle_of_unordered_mutable_list": {
-      "code": "someList[1] = nil",
+      "not-implemented": "true",
       "name": "Erase element in the middle"
     },
     "swap_elements_in_unordered_mutable_list": {
@@ -122,21 +118,19 @@
       "name": "Delete the list"
     },
     "name_of_unordered_immutable_list": {
-      "code": "Dictionary<Key, Value>",
-      "comment": "It is only immutable when assigned to a constant",
+      "not-implemented": "true",
       "name": "What is a unordered immutable list called?"
     },
     "create_a_unordered_immutable_list": {
-      "code": "let someList:[Int: String] = [:]",
+      "not-implemented": "true",
       "name": "Create the list"
     },
     "unordered_immutable_list_start_number": {
       "not-implemented": "true",
-      "comment": "This operation is not necessary as the elements are accessed by the key",
       "name": "What number does it start at?"
     },
     "access_element_in_unordered_immutable_list": {
-      "code": "someList[4]",
+      "not-implemented": "true",
       "name": "Access element by index"
     },
     "delete_unordered_immutable_list": {