diff --git a/internal/classify/rules.go b/internal/classify/rules.go
index 35419e2cc..384b8bcbb 100644
--- a/internal/classify/rules.go
+++ b/internal/classify/rules.go
@@ -10,13 +10,13 @@ var rules = LabelRules{
 	},
 	"abaya": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
 	"academic gown": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -100,7 +100,7 @@ var rules = LabelRules{
 	},
 	"agaric": {
 		Label:      "mushroom",
-		Threshold:  0.400000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{"vegetables"},
 	},
@@ -153,10 +153,10 @@ var rules = LabelRules{
 		Categories: []string{"church"},
 	},
 	"ambulance": {
-		Label:      "van",
+		Label:      "vehicle",
 		Threshold:  0.300000,
 		Priority:   0,
-		Categories: []string{"vehicle"},
+		Categories: []string{},
 	},
 	"american alligator": {
 		Label:      "alligator",
@@ -204,11 +204,11 @@ var rules = LabelRules{
 		Label:      "vehicle",
 		Threshold:  0.300000,
 		Priority:   0,
-		Categories: []string{"military"},
+		Categories: []string{},
 	},
 	"analog clock": {
-		Label:      "clock",
-		Threshold:  0.400000,
+		Label:      "display",
+		Threshold:  0.300000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -339,9 +339,9 @@ var rules = LabelRules{
 		Categories: []string{"shop"},
 	},
 	"balance beam": {
-		Label:      "portrait",
-		Threshold:  0.200000,
-		Priority:   0,
+		Label:      "",
+		Threshold:  1.000000,
+		Priority:   -2,
 		Categories: []string{},
 	},
 	"bald eagle bird": {
@@ -358,13 +358,13 @@ var rules = LabelRules{
 	},
 	"balloon": {
 		Label:      "",
-		Threshold:  0.500000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{},
 	},
 	"ballplayer": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -384,7 +384,7 @@ var rules = LabelRules{
 		Label:      "portrait",
 		Threshold:  0.300000,
 		Priority:   0,
-		Categories: []string{},
+		Categories: []string{"people"},
 	},
 	"banded gecko": {
 		Label:      "lizard",
@@ -508,7 +508,7 @@ var rules = LabelRules{
 	},
 	"bathing cap": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -616,7 +616,7 @@ var rules = LabelRules{
 	},
 	"belt": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -658,7 +658,7 @@ var rules = LabelRules{
 	},
 	"bikini": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -784,19 +784,19 @@ var rules = LabelRules{
 	},
 	"bolete": {
 		Label:      "mushroom",
-		Threshold:  0.400000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{"vegetables"},
 	},
 	"bolo tie": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
 	"bonnet": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -844,7 +844,7 @@ var rules = LabelRules{
 	},
 	"bottle": {
 		Label:      "bottle",
-		Threshold:  0.300000,
+		Threshold:  0.330000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -868,7 +868,7 @@ var rules = LabelRules{
 	},
 	"bow tie": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -910,7 +910,7 @@ var rules = LabelRules{
 	},
 	"brassiere": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -922,7 +922,7 @@ var rules = LabelRules{
 	},
 	"breastplate": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -1114,7 +1114,7 @@ var rules = LabelRules{
 	},
 	"cardigan": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -1222,7 +1222,7 @@ var rules = LabelRules{
 	},
 	"chain mail": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -1372,13 +1372,13 @@ var rules = LabelRules{
 	},
 	"cloak": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
 	"clock": {
-		Label:      "clock",
-		Threshold:  0.400000,
+		Label:      "display",
+		Threshold:  0.300000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -1528,7 +1528,7 @@ var rules = LabelRules{
 	},
 	"coral fungus": {
 		Label:      "mushroom",
-		Threshold:  0.400000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{"vegetables"},
 	},
@@ -1648,7 +1648,7 @@ var rules = LabelRules{
 	},
 	"crossword puzzle": {
 		Label:      "puzzle",
-		Threshold:  0.500000,
+		Threshold:  1.000000,
 		Priority:   -1,
 		Categories: []string{},
 	},
@@ -1666,7 +1666,7 @@ var rules = LabelRules{
 	},
 	"cuirass": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -1912,7 +1912,7 @@ var rules = LabelRules{
 	},
 	"earthstar": {
 		Label:      "mushroom",
-		Threshold:  0.400000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{"vegetables"},
 	},
@@ -2056,7 +2056,7 @@ var rules = LabelRules{
 	},
 	"fashion": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -2266,7 +2266,7 @@ var rules = LabelRules{
 	},
 	"fur coat": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -2428,7 +2428,7 @@ var rules = LabelRules{
 	},
 	"gown": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -2500,7 +2500,7 @@ var rules = LabelRules{
 	},
 	"greenhouse": {
 		Label:      "",
-		Threshold:  0.300000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{"architecture", "building"},
 	},
@@ -2524,7 +2524,7 @@ var rules = LabelRules{
 	},
 	"grocery store": {
 		Label:      "store",
-		Threshold:  0.300000,
+		Threshold:  0.400000,
 		Priority:   0,
 		Categories: []string{"shop"},
 	},
@@ -2572,19 +2572,19 @@ var rules = LabelRules{
 	},
 	"gyromitra": {
 		Label:      "mushroom",
-		Threshold:  0.400000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{"vegetables"},
 	},
 	"hair slide": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
 	"hair spray": {
 		Label:      "bottle",
-		Threshold:  0.300000,
+		Threshold:  0.330000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -2619,9 +2619,9 @@ var rules = LabelRules{
 		Categories: []string{},
 	},
 	"hand blower": {
-		Label:      "portrait",
-		Threshold:  0.300000,
-		Priority:   0,
+		Label:      "",
+		Threshold:  1.000000,
+		Priority:   -2,
 		Categories: []string{},
 	},
 	"hand-held computer": {
@@ -2710,13 +2710,13 @@ var rules = LabelRules{
 	},
 	"hen-of-the-woods": {
 		Label:      "mushroom",
-		Threshold:  0.400000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{"vegetables"},
 	},
 	"heritage": {
 		Label:      "portrait",
-		Threshold:  0.000000,
+		Threshold:  0.300000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -2782,7 +2782,7 @@ var rules = LabelRules{
 	},
 	"hoopskirt": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -3016,7 +3016,7 @@ var rules = LabelRules{
 	},
 	"jean": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -3034,13 +3034,13 @@ var rules = LabelRules{
 	},
 	"jersey": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
 	"jigsaw puzzle": {
 		Label:      "puzzle",
-		Threshold:  0.500000,
+		Threshold:  1.000000,
 		Priority:   -1,
 		Categories: []string{},
 	},
@@ -3088,7 +3088,7 @@ var rules = LabelRules{
 	},
 	"kimono": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -3160,7 +3160,7 @@ var rules = LabelRules{
 	},
 	"lab coat": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -3400,7 +3400,7 @@ var rules = LabelRules{
 	},
 	"lotion": {
 		Label:      "bottle",
-		Threshold:  0.300000,
+		Threshold:  0.330000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -3478,7 +3478,7 @@ var rules = LabelRules{
 	},
 	"maillot": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -3586,7 +3586,7 @@ var rules = LabelRules{
 	},
 	"menu": {
 		Label:      "document",
-		Threshold:  0.000000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{"info"},
 	},
@@ -3633,22 +3633,22 @@ var rules = LabelRules{
 		Categories: []string{"animal"},
 	},
 	"minibus": {
-		Label:      "bus",
+		Label:      "vehicle",
 		Threshold:  0.200000,
 		Priority:   0,
-		Categories: []string{"vehicle"},
+		Categories: []string{},
 	},
 	"miniskirt": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
 	"minivan": {
-		Label:      "van",
+		Label:      "vehicle",
 		Threshold:  0.200000,
 		Priority:   0,
-		Categories: []string{"vehicle"},
+		Categories: []string{},
 	},
 	"mink": {
 		Label:      "animal",
@@ -3736,7 +3736,7 @@ var rules = LabelRules{
 	},
 	"mortarboard": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -3783,10 +3783,10 @@ var rules = LabelRules{
 		Categories: []string{},
 	},
 	"moving van": {
-		Label:      "van",
+		Label:      "vehicle",
 		Threshold:  0.200000,
 		Priority:   0,
-		Categories: []string{"vehicle"},
+		Categories: []string{},
 	},
 	"mud turtle": {
 		Label:      "turtle",
@@ -3796,7 +3796,7 @@ var rules = LabelRules{
 	},
 	"mushroom": {
 		Label:      "mushroom",
-		Threshold:  0.400000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{"vegetables"},
 	},
@@ -3808,19 +3808,19 @@ var rules = LabelRules{
 	},
 	"nail": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
 	"neck brace": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
 	"necklace": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -3844,7 +3844,7 @@ var rules = LabelRules{
 	},
 	"nipple": {
 		Label:      "bottle",
-		Threshold:  0.300000,
+		Threshold:  0.330000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -3958,7 +3958,7 @@ var rules = LabelRules{
 	},
 	"overskirt": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -4018,7 +4018,7 @@ var rules = LabelRules{
 	},
 	"pajama": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -4156,7 +4156,7 @@ var rules = LabelRules{
 	},
 	"perfume": {
 		Label:      "bottle",
-		Threshold:  0.300000,
+		Threshold:  0.330000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -4228,7 +4228,7 @@ var rules = LabelRules{
 	},
 	"pill bottle": {
 		Label:      "bottle",
-		Threshold:  0.300000,
+		Threshold:  0.330000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -4308,7 +4308,7 @@ var rules = LabelRules{
 		Label:      "farm",
 		Threshold:  0.300000,
 		Priority:   0,
-		Categories: []string{"vehicle"},
+		Categories: []string{},
 	},
 	"plunger": {
 		Label:      "",
@@ -4335,10 +4335,10 @@ var rules = LabelRules{
 		Categories: []string{},
 	},
 	"police van": {
-		Label:      "van",
+		Label:      "vehicle",
 		Threshold:  0.000000,
 		Priority:   0,
-		Categories: []string{"vehicle"},
+		Categories: []string{},
 	},
 	"pomegranate": {
 		Label:      "fruit",
@@ -4354,7 +4354,7 @@ var rules = LabelRules{
 	},
 	"poncho": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -4366,7 +4366,7 @@ var rules = LabelRules{
 	},
 	"pop bottle": {
 		Label:      "bottle",
-		Threshold:  0.300000,
+		Threshold:  0.330000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -4498,7 +4498,7 @@ var rules = LabelRules{
 	},
 	"puzzle": {
 		Label:      "puzzle",
-		Threshold:  0.500000,
+		Threshold:  1.000000,
 		Priority:   -1,
 		Categories: []string{},
 	},
@@ -4647,10 +4647,10 @@ var rules = LabelRules{
 		Categories: []string{},
 	},
 	"restaurant": {
-		Label:      "",
+		Label:      "dining",
 		Threshold:  0.200000,
 		Priority:   0,
-		Categories: []string{"dining"},
+		Categories: []string{},
 	},
 	"revolver": {
 		Label:      "weapon",
@@ -4816,7 +4816,7 @@ var rules = LabelRules{
 	},
 	"sarong": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -4839,10 +4839,10 @@ var rules = LabelRules{
 		Categories: []string{"animal"},
 	},
 	"school bus": {
-		Label:      "bus",
+		Label:      "vehicle",
 		Threshold:  0.200000,
 		Priority:   0,
-		Categories: []string{"vehicle", "public transport"},
+		Categories: []string{},
 	},
 	"schooner": {
 		Label:      "ship",
@@ -5079,7 +5079,7 @@ var rules = LabelRules{
 		Categories: []string{},
 	},
 	"sliding door": {
-		Label:      "door",
+		Label:      "building",
 		Threshold:  0.200000,
 		Priority:   0,
 		Categories: []string{},
@@ -5127,10 +5127,10 @@ var rules = LabelRules{
 		Categories: []string{"cat", "animal", "wildlife"},
 	},
 	"snowmobile": {
-		Label:      "vehicle",
-		Threshold:  0.400000,
+		Label:      "snowmobile",
+		Threshold:  0.500000,
 		Priority:   0,
-		Categories: []string{"snow"},
+		Categories: []string{"vehicle"},
 	},
 	"snowplow": {
 		Label:      "snow",
@@ -5140,7 +5140,7 @@ var rules = LabelRules{
 	},
 	"soap dispenser": {
 		Label:      "bottle",
-		Threshold:  0.300000,
+		Threshold:  0.330000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -5152,7 +5152,7 @@ var rules = LabelRules{
 	},
 	"sock": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -5170,7 +5170,7 @@ var rules = LabelRules{
 	},
 	"sombrero": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -5356,7 +5356,7 @@ var rules = LabelRules{
 	},
 	"stinkhorn": {
 		Label:      "mushroom",
-		Threshold:  0.400000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{"vegetables"},
 	},
@@ -5428,7 +5428,7 @@ var rules = LabelRules{
 	},
 	"suit": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
@@ -5451,20 +5451,20 @@ var rules = LabelRules{
 		Categories: []string{},
 	},
 	"sunglass": {
-		Label:      "sunny day",
+		Label:      "sunshine",
 		Threshold:  0.200000,
 		Priority:   2,
 		Categories: []string{},
 	},
 	"sunglasses": {
-		Label:      "sunny day",
+		Label:      "sunshine",
 		Threshold:  0.200000,
 		Priority:   2,
 		Categories: []string{},
 	},
 	"sunscreen": {
 		Label:      "bottle",
-		Threshold:  0.300000,
+		Threshold:  0.330000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -5488,12 +5488,12 @@ var rules = LabelRules{
 	},
 	"sweatshirt": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
 	"swimming trunks": {
-		Label:      "sunny day",
+		Label:      "sunshine",
 		Threshold:  0.200000,
 		Priority:   0,
 		Categories: []string{"people", "portrait"},
@@ -5847,10 +5847,10 @@ var rules = LabelRules{
 		Categories: []string{"architecture"},
 	},
 	"trolleybus": {
-		Label:      "bus",
+		Label:      "vehicle",
 		Threshold:  0.500000,
 		Priority:   0,
-		Categories: []string{"vehicle"},
+		Categories: []string{},
 	},
 	"trombone": {
 		Label:      "instrument",
@@ -6009,8 +6009,8 @@ var rules = LabelRules{
 		Categories: []string{},
 	},
 	"wall clock": {
-		Label:      "clock",
-		Threshold:  0.400000,
+		Label:      "display",
+		Threshold:  0.300000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -6202,7 +6202,7 @@ var rules = LabelRules{
 	},
 	"windsor tie": {
 		Label:      "portrait",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"people"},
 	},
diff --git a/internal/classify/rules.yml b/internal/classify/rules.yml
index 9199747af..b0dc9c463 100644
--- a/internal/classify/rules.yml
+++ b/internal/classify/rules.yml
@@ -107,7 +107,7 @@ rapeseed:
 
 fashion:
   label: portrait
-  threshold: 0.2
+  threshold: 0.35
   categories:
     - people
 
@@ -1781,16 +1781,12 @@ airship:
     - vehicle
 
 ambulance:
-  label: van
+  label: vehicle
   threshold: 0.3
-  categories:
-    - vehicle
 
 amphibian:
   label: vehicle
   threshold: 0.3
-  categories:
-    - military
 
 half track:
   label: vehicle
@@ -2102,14 +2098,13 @@ dial telephone:
   see: electronics
 
 clock:
-  label: clock
-  threshold: 0.4
+  see: display
 
 analog clock:
-  see: clock
+  see: display
 
 wall clock:
-  see: clock
+  see: display
 
 digital clock:
   see: display
@@ -2270,14 +2265,14 @@ grand piano:
   see: instrument
 
 greenhouse:
-  threshold: 0.3
+  threshold: 0.5
   categories:
     - architecture
     - building
 
 grocery store:
   label: store
-  threshold: 0.3
+  threshold: 0.4
   categories:
     - shop
 
@@ -2442,16 +2437,12 @@ microwave:
     - electronics
 
 minibus:
-  label: bus
+  label: vehicle
   threshold: 0.2
-  categories:
-    - vehicle
 
 minivan:
-  label: van
+  label: vehicle
   threshold: 0.2
-  categories:
-    - vehicle
 
 mixing bowl:
   label: bowl
@@ -2517,10 +2508,8 @@ mountain tent:
     - outdoor
 
 moving van:
-  label: van
+  label: vehicle
   threshold: 0.2
-  categories:
-    - vehicle
 
 notebook:
   label: computer
@@ -2640,7 +2629,7 @@ piggy bank:
 
 bottle:
   label: bottle
-  threshold: 0.3
+  threshold: 0.33
 
 sunscreen:
   see: bottle
@@ -2685,9 +2674,7 @@ polaroid camera:
     - photography
 
 police van:
-  label: van
-  categories:
-    - vehicle
+  label: vehicle
 
 pool table:
   see: ignore
@@ -2751,9 +2738,8 @@ refrigerator:
     - kitchen
 
 restaurant:
+  label: dining
   threshold: 0.2
-  categories:
-    - dining
 
 revolver:
   see: weapon
@@ -2792,11 +2778,8 @@ sax:
   see: instrument
 
 school bus:
-  label: bus
+  label: vehicle
   threshold: 0.2
-  categories:
-    - vehicle
-    - public transport
 
 schooner:
   see: ship
@@ -2835,7 +2818,7 @@ sleeping bag:
   threshold: 0.2
 
 sliding door:
-  label: door
+  label: building
   threshold: 0.2
 
 snorkel:
@@ -2843,10 +2826,10 @@ snorkel:
   threshold: 0.2
 
 snowmobile:
-  label: vehicle
-  threshold: 0.4
+  label: snowmobile
+  threshold: 0.5
   categories:
-    - snow
+    - vehicle
 
 snowplow:
   label: snow
@@ -2855,8 +2838,6 @@ snowplow:
 plow:
   label: farm
   threshold: 0.3
-  categories:
-    - vehicle
 
 soap dispenser:
   see: bottle
@@ -2944,7 +2925,7 @@ suspension bridge:
     - building
 
 swimming trunks:
-  label: sunny day
+  label: sunshine
   threshold: 0.2
   categories:
     - people
@@ -2992,10 +2973,8 @@ triumphal arch:
   see: historic architecture
 
 trolleybus:
-  label: bus
+  label: vehicle
   threshold: 0.5
-  categories:
-    - vehicle
 
 trombone:
   see: instrument
@@ -3372,7 +3351,7 @@ buckeye:
 
 mushroom:
   label: mushroom
-  threshold: 0.4
+  threshold: 0.5
   categories:
     - vegetables
 
@@ -3458,7 +3437,7 @@ ear:
   see: ignore
 
 sunglasses:
-  label: sunny day
+  label: sunshine
   priority: 2
   threshold: 0.2
 
@@ -3486,6 +3465,7 @@ brass:
 
 menu:
   label: document
+  threshold: 0.5
   categories:
     - info
 
@@ -3503,7 +3483,7 @@ letter opener:
 
 puzzle:
   label: puzzle
-  threshold: 0.5
+  threshold: 1
   priority: -1
 
 crossword puzzle:
@@ -3523,7 +3503,7 @@ bearskin:
 
 ballplayer:
   label: portrait
-  threshold: 0.2
+  threshold: 0.5
 
 crutch:
   see: ignore
@@ -3531,16 +3511,15 @@ crutch:
 mousetrap:
   see: ignore
 
-band aid:
-  label: portrait
-  threshold: 0.3
-
 portrait:
   label: portrait
   threshold: 0.3
   categories:
     - people
 
+band aid:
+  see: portrait
+
 oxygen mask:
   see: portrait
 
@@ -3554,9 +3533,7 @@ ski mask:
   see: portrait
 
 heritage:
-  label: portrait
-  categories:
-    - people
+  see: portrait
 
 safety pin:
   see: ignore
@@ -3749,11 +3726,10 @@ bulletproof vest:
   see: ignore
 
 balance beam:
-  label: portrait
-  threshold: 0.2
+  see: ignore
 
 balloon:
-  threshold: 0.5
+  threshold: 0.6
 
 display:
   label: display
@@ -3854,8 +3830,7 @@ guillotine:
   see: ignore
 
 hand blower:
-  threshold: 0.3
-  label: portrait
+  see: ignore
 
 fire-screen:
   see: ignore