diff --git a/server/controllers/lighthouse.js b/server/controllers/lighthouse.js
index 27466f1..8ea704e 100644
--- a/server/controllers/lighthouse.js
+++ b/server/controllers/lighthouse.js
@@ -63,12 +63,21 @@ function getResults (input) {
       },
     },
   };
-  const funcScore = { // 100 LBC adds 1 point to the score
+  const funcScoreClaimWeight = { // 100 LBC adds 1 point to the score
     'function_score': {
-      'script_score': {
-        'script': {
-          'source': `${effectiveFactor} * doc['effective_amount'].value`,
-        },
+      'field_value_factor': {
+        'field'  : 'effective_amount',
+        'factor' : effectiveFactor,
+        'missing': 1,
+      },
+    },
+  };
+  const funcScoreChannelWeight = { // 100 LBC adds 1 point to the score
+    'function_score': {
+      'field_value_factor': {
+        'field'  : 'certificate_amount',
+        'factor' : effectiveFactor,
+        'missing': 1,
       },
     },
   };
@@ -176,7 +185,8 @@ function getResults (input) {
         'bool': {
           'should': [
             conBoost,
-            funcScore,
+            funcScoreClaimWeight,
+            funcScoreChannelWeight,
           ],
           'must': [
             channelSearch,
diff --git a/server/utils/chainquery/index.js b/server/utils/chainquery/index.js
index d198329..4dfb7b2 100644
--- a/server/utils/chainquery/index.js
+++ b/server/utils/chainquery/index.js
@@ -172,6 +172,7 @@ function getClaimsSince (time, lastID, MaxClaimsInCall) {
       `p.name as channel,` +
       `c.bid_state,` +
       `c.effective_amount,` +
+      `COALESCE(p.effective_amount,0.0) as certificate_amount,` +
       `c.claim_id as claimId,` +
       `c.value_as_json as value ` +
       `FROM claim c ` +