diff --git a/var/www/Flasks/Flask_terms.py b/var/www/Flasks/Flask_terms.py
index b56375e7..fad048bd 100644
--- a/var/www/Flasks/Flask_terms.py
+++ b/var/www/Flasks/Flask_terms.py
@@ -20,13 +20,13 @@ cfg = Flask_config.cfg
 r_serv_term = Flask_config.r_serv_term
 # ============ FUNCTIONS ============
 
-def Term_getValueOverRange(word, startDate, num_day):
+def Term_getValueOverRange(word, startDate, num_day, per_paste=""):
     passed_days = 0
     oneDay = 60*60*24
     to_return = []
     curr_to_return = 0
     for timestamp in range(startDate, startDate - max(num_day)*oneDay, -oneDay):
-        value = r_serv_term.hget(timestamp, word)
+        value = r_serv_term.hget(per_paste+str(timestamp), word)
         curr_to_return += int(value) if value is not None else 0
         for i in num_day:
             if passed_days == i-1:
@@ -39,6 +39,14 @@ def Term_getValueOverRange(word, startDate, num_day):
 
 @app.route("/terms_management/")
 def terms_management():
+    per_paste = request.args.get('per_paste')
+    if per_paste == "1" or per_paste is None:
+        per_paste_text = "per_paste_"
+        per_paste = 1
+    else:
+        per_paste_text = ""
+        per_paste = 0
+
     TrackedTermsSet_Name = "TrackedSetTermSet"
     BlackListTermsSet_Name = "BlackListSetTermSet"
     TrackedTermsDate_Name = "TrackedTermDate"
@@ -53,7 +61,7 @@ def terms_management():
     track_list_num_of_paste = []
     for tracked_term in r_serv_term.smembers(TrackedTermsSet_Name):
         track_list.append(tracked_term)
-        value_range = Term_getValueOverRange(tracked_term, today_timestamp, [1, 7, 31])
+        value_range = Term_getValueOverRange(tracked_term, today_timestamp, [1, 7, 31], per_paste=per_paste_text)
 
         term_date = r_serv_term.hget(TrackedTermsDate_Name, tracked_term)
 
@@ -70,7 +78,7 @@ def terms_management():
         term_date = datetime.datetime.utcfromtimestamp(int(term_date)) if term_date is not None else "No date recorded"
         black_list.append([blacked_term, term_date])
 
-    return render_template("terms_management.html", black_list=black_list, track_list=track_list, track_list_values=track_list_values,  track_list_num_of_paste=track_list_num_of_paste)
+    return render_template("terms_management.html", black_list=black_list, track_list=track_list, track_list_values=track_list_values,  track_list_num_of_paste=track_list_num_of_paste, per_paste=per_paste)
 
 
 @app.route("/terms_management_query_paste/")
@@ -182,12 +190,19 @@ def terms_plot_tool_data():
     range_end = calendar.timegm(range_end.timetuple())
     term =  request.args.get('term')
 
+    per_paste = request.args.get('per_paste')
+    if per_paste == "1" or per_paste is None:
+        per_paste = "per_paste_"
+    else:
+        per_paste = ""
+
+
     if term is None:
         return "None"
     else:
         value_range = []
         for timestamp in range(range_start, range_end+oneDay, oneDay):
-            value = r_serv_term.hget(timestamp, term)
+            value = r_serv_term.hget(per_paste+str(timestamp), term)
             curr_value_range = int(value) if value is not None else 0
             value_range.append([timestamp, curr_value_range])
         value_range.insert(0,term)
@@ -208,8 +223,8 @@ def terms_plot_top_data():
     today = today.replace(hour=0, minute=0, second=0, microsecond=0)
     today_timestamp = calendar.timegm(today.timetuple())
 
-    per_paste = int(request.args.get('per_paste'))
-    if per_paste == 1:
+    per_paste = request.args.get('per_paste')
+    if per_paste == "1" or per_paste is None:
         per_paste = "per_paste_"
     else:
         per_paste = ""
@@ -221,8 +236,6 @@ def terms_plot_top_data():
     the_set = per_paste + request.args.get('set')
     num_day = int(request.args.get('num_day'))
 
-    print(set_day)
-    print(per_paste)
     if the_set is None:
         return "None"
     else:
diff --git a/var/www/templates/terms_management.html b/var/www/templates/terms_management.html
index 1cbfb67c..22cbbc51 100644
--- a/var/www/templates/terms_management.html
+++ b/var/www/templates/terms_management.html
@@ -12,6 +12,7 @@
   <link href="{{ url_for('static', filename='font-awesome/css/font-awesome.css') }}" rel="stylesheet">
   <link href="{{ url_for('static', filename='css/sb-admin-2.css') }}" rel="stylesheet">
   <link href="{{ url_for('static', filename='css/dataTables.bootstrap.css') }}" rel="stylesheet" type="text/css" />
+  <link href="{{ url_for('static', filename='css/switch_checkbox.css') }}" rel="stylesheet" type="text/css" />
   <script language="javascript" src="{{ url_for('static', filename='js/jquery.js')}}"></script>
   <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
   <script src="{{ url_for('static', filename='js/jquery.dataTables.min.js') }}"></script>
@@ -91,6 +92,13 @@
         <div class="col-lg-12">
             <div class="row">
                 <div class="col-lg-12">
+                   <label class="switch">
+                       <input id="per_paste" class="switch-input" value="per_paste" type="checkbox" onclick="reload_per_paste()">
+                       <span class="switch-label" data-on="On" data-off="Off"></span>
+                       <span class="switch-handle"></span>
+                   </label>
+                   <strong style="top: 3px; position: relative;">1 term per paste</strong>
+
                     <div id="panel-today" class="panel panel-success">
                         <div class="panel-heading">
                             <strong>Manage tracked terms</strong>
@@ -194,13 +202,21 @@
 
 <!-- import graph function -->
 <script>
+    function reload_per_paste() {
+        var checked = $("#per_paste").prop( "checked" ) ? 1 : 0;
+        window.location.href = {{ url_for('terms_management') }}+"?per_paste="+checked;
+    }
+
+
     var table_track;
     var table_black;
 
     $(document).ready(function(){
         activePage = $('h1.page-header').attr('data-page');
         $("#"+activePage).addClass("active");
-
+        if({{ per_paste }} ==  1) {
+            $("#per_paste").attr('checked', true)
+        }
 
         $('[data-toggle="tooltip"]').tooltip();
 	table_track = $('#myTable').DataTable();
diff --git a/var/www/templates/terms_plot_tool.html b/var/www/templates/terms_plot_tool.html
index 0205a89f..0f2c5d9d 100644
--- a/var/www/templates/terms_plot_tool.html
+++ b/var/www/templates/terms_plot_tool.html
@@ -13,6 +13,7 @@
   <link href="{{ url_for('static', filename='css/sb-admin-2.css') }}" rel="stylesheet">
   <link href="{{ url_for('static', filename='css/dataTables.bootstrap.css') }}" rel="stylesheet" type="text/css" />
   <link href="{{ url_for('static', filename='css/jquery-ui.min.css') }}" rel="stylesheet" type="text/css" />
+  <link href="{{ url_for('static', filename='css/switch_checkbox.css') }}" rel="stylesheet" type="text/css" />
   <script language="javascript" src="{{ url_for('static', filename='js/jquery.js')}}"></script>
   <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
   <script src="{{ url_for('static', filename='js/jquery.dataTables.min.js') }}"></script>
@@ -81,6 +82,15 @@
                                 <button id="plot-btn-add" class="btn btn-success" style="margin-left: 6px;"><span class="fa fa-plus"></span> Add the term to the chart</button>
                             </div>
 
+                            <div class='pull_right' style="float: right;">
+                                <label class="switch">
+                                    <input id="per_paste" class="switch-input" value="per_paste" type="checkbox" checked>
+                                    <span class="switch-label" data-on="On" data-off="Off"></span>
+                                    <span class="switch-handle"></span>
+                                </label>
+                                <strong style="top: 3px; position: relative;">1 term per paste</strong>
+                            </div>
+
                         </div>
                         <!-- /.panel-body -->
                     </div>
@@ -202,8 +212,9 @@ function plotData() {
     plotted_terms = [term]
     var range_start = new Date($( ".sliderRange" ).slider( "values", 0 )).getTime() / 1000;
     var range_end = new Date($( ".sliderRange" ).slider( "values", 1 )).getTime() / 1000;
+    var checked = $("#per_paste").prop( "checked" ) ? 1 : 0;
 
-    $.getJSON("{{ url_for('terms_plot_tool_data') }}", { range_start: range_start, range_end: range_end, term: term }, function(data, status){
+    $.getJSON("{{ url_for('terms_plot_tool_data') }}", { range_start: range_start, range_end: range_end, term: term, per_paste: checked }, function(data, status){
         graph_data = [];
         var to_plot = [];
         var curr_data = [];
@@ -239,8 +250,9 @@ function addData() {
     plotted_terms.push(term)
     var range_start = new Date($( ".sliderRange" ).slider( "values", 0 )).getTime() / 1000;
     var range_end = new Date($( ".sliderRange" ).slider( "values", 1 )).getTime() / 1000;
+    var checked = $("#per_paste").prop( "checked" ) ? 1 : 0;
 
-    $.getJSON("{{ url_for('terms_plot_tool_data') }}", { range_start: range_start, range_end: range_end, term: term }, function(data, status){
+    $.getJSON("{{ url_for('terms_plot_tool_data') }}", { range_start: range_start, range_end: range_end, term: term, per_paste: checked }, function(data, status){
         var curr_data = [];
         for(i=1; i<data.length; i++) {
                 curr_data.push([data[i][0]*1000, data[i][1]]);
@@ -259,8 +271,9 @@ function replot() {
         var term = plotted_terms[i];
         var range_start = new Date($( ".sliderRange" ).slider( "values", 0 )).getTime() / 1000;
         var range_end = new Date($( ".sliderRange" ).slider( "values", 1 )).getTime() / 1000;
+        var checked = $("#per_paste").prop( "checked" ) ? 1 : 0;
 
-        promises.push($.getJSON("{{ url_for('terms_plot_tool_data') }}", { range_start: range_start, range_end: range_end, term: term }, function(data, status){
+        promises.push($.getJSON("{{ url_for('terms_plot_tool_data') }}", { range_start: range_start, range_end: range_end, term: term, per_paste: checked }, function(data, status){
             var curr_data = [];
             for(i=1; i<data.length; i++) {
                     curr_data.push([data[i][0]*1000, data[i][1]]);
@@ -279,5 +292,3 @@ function replot() {
 </script>
 
 
-</body>
-</html>