diff --git a/analyzers/Cyberprotect/CyberprotectAnalyzer.py b/analyzers/Cyberprotect/CyberprotectAnalyzer.py
index fbb9b0009..5314329c7 100755
--- a/analyzers/Cyberprotect/CyberprotectAnalyzer.py
+++ b/analyzers/Cyberprotect/CyberprotectAnalyzer.py
@@ -16,12 +16,12 @@ def summary(self, raw):
         taxonomies = []
         namespace = "Cyberprotect"
         if self.service == 'ThreatScore':
-            level = 'info';
+            level = 'info'
             value = 'not in database'
-            if(raw.get('data') and raw.get('scores') and len(raw.get('scores')) > 0):
+            if raw.get('data') and raw.get('scores') and len(raw.get('scores')) > 0:
                 value = 'not analyzed yet'
-                if(raw['scores'][0].get('score')):
-                    level = 'safe';
+                if raw['scores'][0].get('score'):
+                    level = 'safe'
                     value = raw['scores'][0]['score']
                     if value >= 0.5:
                         level = 'malicious'
@@ -35,7 +35,7 @@ def run(self):
         if self.service == 'ThreatScore' and (self.data_type == 'domain' or self.data_type == 'ip'):
             try:
                 response = requests.get("{}{}".format(self.URI, self.get_data()))
-                self.report(response.json())
+                self.report({'result': response.json()})
             except Exception as e:
                 self.unexpectedError(e)
         else:
diff --git a/thehive-templates/Cyberprotect_ThreatScore/long.html b/thehive-templates/Cyberprotect_ThreatScore_1_0/long.html
similarity index 69%
rename from thehive-templates/Cyberprotect_ThreatScore/long.html
rename to thehive-templates/Cyberprotect_ThreatScore_1_0/long.html
index 18a087557..714978715 100755
--- a/thehive-templates/Cyberprotect_ThreatScore/long.html
+++ b/thehive-templates/Cyberprotect_ThreatScore_1_0/long.html
@@ -1,23 +1,23 @@
 <div class="panel panel-info" ng-if="success">
     <div class="panel-heading">
-        <a href="https://threatscore.cyberprotect.fr" target="_blank">threatscore.cyberprotect.fr</a> Cyberprotect threat scoring system
+        Cyberprotect threat scoring system <a href="https://threatscore.cyberprotect.fr" target="_blank"><i class="fa fa-external-link"></i></a>
         <br/> Report for
         <strong>{{artifact.data}}</strong>
     </div>
-    <div class="panel-body" ng-if="content.scores.length > 0">
+    <div class="panel-body" ng-if="content.result.scores.length > 0">
         <h4 class="dl-horizontal">{{content.scores.length}} scores found.</h4>
         <table class="table table-bordered">
             <tr>
                 <th>Date</th>
                 <th>Score</th>
             </tr>
-            <tr ng-repeat="score in ::content.scores">
+            <tr ng-repeat="score in ::content.result.scores">
                 <td>{{score.date}}</td>
                 <td>{{score.score}}</td>
             </tr>
         </table>
     </div>
-    <div class="panel-body" ng-if="content.scores.length < 1">
+    <div class="panel-body" ng-if="!(content.result.scores.length > 0)">
         No results found
     </div>
 </div>
diff --git a/thehive-templates/Cyberprotect_ThreatScore/short.html b/thehive-templates/Cyberprotect_ThreatScore_1_0/short.html
similarity index 100%
rename from thehive-templates/Cyberprotect_ThreatScore/short.html
rename to thehive-templates/Cyberprotect_ThreatScore_1_0/short.html