diff --git a/server.py b/server.py
index 8b5bf390f5188f2efd3ef9b74d0d4be6e5103ac4..c6580ba7aadfa40dfb08e39272b98d9c2531b86e 100644
--- a/server.py
+++ b/server.py
@@ -95,7 +95,12 @@ def evaluate_policy():
                     legaltagslist.extend(get_legal_tag_list(record))
             if not 'legaltags' in input_json or not isinstance(input_json['legaltags'], list):
                 input_json['legaltags'] = []
-            input_json['legaltags'].extend(get_legal_tag_info(legaltagslist, data_partition_id, access_token))
+            # input_json['legaltags'].extend(get_legal_tag_info(legaltagslist, data_partition_id, access_token))
+            # Added for issue#17
+            legalTagListLen = len(legaltagslist)
+            for x in range(0, legalTagListLen+1, 25):
+                input_json['legaltags'].extend(get_legal_tag_info(legaltagslist[x:x+25], data_partition_id, access_token))
+
         except Exception as err:
             logging.info(err)
         url = conf.OPA_DATA_API + '/' + policy_id