Index: binaries/data/mods/public/simulation/templates/special/spy.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/spy.xml
+++ binaries/data/mods/public/simulation/templates/special/spy.xml
@@ -19,7 +19,7 @@
   </Identity>
   <VisionSharing>
     <Bribable>false</Bribable>
-    <Duration>15</Duration>
+    <Duration>30</Duration>
     <FailureCostRatio>0.25</FailureCostRatio>
   </VisionSharing>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
@@ -31,7 +31,7 @@
     <SelectionGroupName>template_unit_ship_fishing</SelectionGroupName>
     <Tooltip>Fish the waters for food.</Tooltip>
     <Classes datatype="tokens">-ConquestCritical</Classes>
-    <VisibleClasses datatype="tokens">FishingBoat</VisibleClasses>
+    <VisibleClasses datatype="tokens">FishingBoat Bribable</VisibleClasses>
   </Identity>
   <Loot>
     <xp>1</xp>
@@ -87,4 +87,7 @@
   <Vision>
     <Range>30</Range>
   </Vision>
+  <VisionSharing>
+    <Bribable>true</Bribable>
+  </VisionSharing>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_support.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit">
   <Identity>
     <Classes datatype="tokens">Human Organic</Classes>
-    <VisibleClasses datatype="tokens">Support</VisibleClasses>
+    <VisibleClasses datatype="tokens">Support Bribable</VisibleClasses>
     <GenericName>Support</GenericName>
   </Identity>
   <Minimap>
@@ -34,4 +34,7 @@
   <UnitAI>
     <DefaultStance>passive</DefaultStance>
   </UnitAI>
+  <VisionSharing>
+    <Bribable>true</Bribable>
+  </VisionSharing>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
@@ -12,7 +12,7 @@
   </Health>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical</Classes>
-    <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
+    <VisibleClasses datatype="tokens">Trader</VisibleClasses>
     <GenericName>Trader</GenericName>
     <SelectionGroupName>template_unit_support_trader</SelectionGroupName>
     <Tooltip>Trade resources between your own markets and those of your allies.</Tooltip>
@@ -50,7 +50,4 @@
   <Vision>
     <Range>60</Range>
   </Vision>
-  <VisionSharing>
-    <Bribable>true</Bribable>
-  </VisionSharing>
 </Entity>