diff --git a/app/common b/app/common
index 695ae8e..63c998d 160000
--- a/app/common
+++ b/app/common
@@ -1 +1 @@
-Subproject commit 695ae8eb974c599ed8c203509b2faff5b916967c
+Subproject commit 63c998d44fcff5a3ecb3c58c789f24c7ca8db37c
diff --git a/app/service/view.py b/app/service/view.py
index c8a2aaa..b68d627 100644
--- a/app/service/view.py
+++ b/app/service/view.py
@@ -36,7 +36,6 @@ class ServiceView(FlaskView):
         if server and form.validate_on_submit():
             stream_type = form.type.data
             file_handle = form.file.data
-            tags = form.tags.data
             m3u_parser = M3uParser()
             m3u_parser.load_content(file_handle.read().decode('utf-8'))
             m3u_parser.parse()
@@ -76,7 +75,6 @@ class ServiceView(FlaskView):
                     stream.input.urls[0].uri = input_url
 
                 stream.tvg_logo = default_logo_path
-                stream.tags = tags
 
                 title = file['title']
                 if len(title) < constants.MAX_STREAM_NAME_LENGTH:
diff --git a/app/templates/service/upload_m3u.html b/app/templates/service/upload_m3u.html
index 555d12c..4ea7e66 100644
--- a/app/templates/service/upload_m3u.html
+++ b/app/templates/service/upload_m3u.html
@@ -29,9 +29,6 @@ Upload m3u | {{ config['PUBLIC_CONFIG'].site.title }}
                     <div class="col-md-3">
                         Type: {{ form.type }}
                     </div>
-                    <div class="col-md-3">
-                        Tags: {{ form.tags }}
-                    </div>
                     <div class="col-md-3">
                         {{ form_field(form.submit, class="btn btn-success") }}
                     </div>
diff --git a/app/templates/stream/catchup/base.html b/app/templates/stream/catchup/base.html
index 555ef9c..56b3870 100644
--- a/app/templates/stream/catchup/base.html
+++ b/app/templates/stream/catchup/base.html
@@ -36,8 +36,6 @@
         <br>
         {{ render_bootstrap_field(form.group_title) }}
         <br>
-        {{ render_bootstrap_field(form.tags) }}
-        <br>
         {{ render_bootstrap_field(form.audio_select) }}
         <br>
         {{ render_bootstrap_field(form.have_video) }}
diff --git a/app/templates/stream/cod_encode/base.html b/app/templates/stream/cod_encode/base.html
index 8891b55..db00d45 100644
--- a/app/templates/stream/cod_encode/base.html
+++ b/app/templates/stream/cod_encode/base.html
@@ -36,8 +36,6 @@
         <br>
         {{ render_bootstrap_field(form.group_title) }}
         <br>
-        {{ render_bootstrap_field(form.tags) }}
-        <br>
         {{ render_bootstrap_field(form.audio_select) }}
         <br>
         {{ render_bootstrap_field(form.have_video) }}
diff --git a/app/templates/stream/cod_relay/base.html b/app/templates/stream/cod_relay/base.html
index 293247d..faae3e3 100644
--- a/app/templates/stream/cod_relay/base.html
+++ b/app/templates/stream/cod_relay/base.html
@@ -36,8 +36,6 @@
         <br>
         {{ render_bootstrap_field(form.group_title) }}
         <br>
-        {{ render_bootstrap_field(form.tags) }}
-        <br>
         {{ render_bootstrap_field(form.audio_select) }}
         <br>
         {{ render_bootstrap_field(form.have_video) }}
diff --git a/app/templates/stream/encode/base.html b/app/templates/stream/encode/base.html
index 8891b55..db00d45 100644
--- a/app/templates/stream/encode/base.html
+++ b/app/templates/stream/encode/base.html
@@ -36,8 +36,6 @@
         <br>
         {{ render_bootstrap_field(form.group_title) }}
         <br>
-        {{ render_bootstrap_field(form.tags) }}
-        <br>
         {{ render_bootstrap_field(form.audio_select) }}
         <br>
         {{ render_bootstrap_field(form.have_video) }}
diff --git a/app/templates/stream/proxy/base.html b/app/templates/stream/proxy/base.html
index d39f2c1..3985830 100644
--- a/app/templates/stream/proxy/base.html
+++ b/app/templates/stream/proxy/base.html
@@ -36,8 +36,6 @@
         <br>
         {{ render_bootstrap_field(form.group_title) }}
         <br>
-        {{ render_bootstrap_field(form.tags) }}
-        <br>
         {{ render_bootstrap_form(form.output) }}
         <br>
         {{ render_bootstrap_form(form.price) }}
diff --git a/app/templates/stream/relay/base.html b/app/templates/stream/relay/base.html
index 293247d..faae3e3 100644
--- a/app/templates/stream/relay/base.html
+++ b/app/templates/stream/relay/base.html
@@ -36,8 +36,6 @@
         <br>
         {{ render_bootstrap_field(form.group_title) }}
         <br>
-        {{ render_bootstrap_field(form.tags) }}
-        <br>
         {{ render_bootstrap_field(form.audio_select) }}
         <br>
         {{ render_bootstrap_field(form.have_video) }}
diff --git a/app/templates/stream/test_life/base.html b/app/templates/stream/test_life/base.html
index 3aff979..9b35631 100644
--- a/app/templates/stream/test_life/base.html
+++ b/app/templates/stream/test_life/base.html
@@ -36,8 +36,6 @@
         <br>
         {{ render_bootstrap_field(form.group_title) }}
         <br>
-        {{ render_bootstrap_field(form.tags) }}
-        <br>
         {{ render_bootstrap_field(form.audio_select) }}
         <br>
         {{ render_bootstrap_field(form.have_video) }}
diff --git a/app/templates/stream/timeshift_player/base.html b/app/templates/stream/timeshift_player/base.html
index ccc5a2b..4ccdefb 100644
--- a/app/templates/stream/timeshift_player/base.html
+++ b/app/templates/stream/timeshift_player/base.html
@@ -36,8 +36,6 @@
         <br>
         {{ render_bootstrap_field(form.group_title) }}
         <br>
-        {{ render_bootstrap_field(form.tags) }}
-        <br>
         {{ render_bootstrap_field(form.audio_select) }}
         <br>
         {{ render_bootstrap_field(form.have_video) }}
diff --git a/app/templates/stream/timeshift_recorder/base.html b/app/templates/stream/timeshift_recorder/base.html
index bd053fc..954830f 100644
--- a/app/templates/stream/timeshift_recorder/base.html
+++ b/app/templates/stream/timeshift_recorder/base.html
@@ -36,8 +36,6 @@
         <br>
         {{ render_bootstrap_field(form.group_title) }}
         <br>
-        {{ render_bootstrap_field(form.tags) }}
-        <br>
         {{ render_bootstrap_field(form.avformat) }}
         <br>
         {{ render_bootstrap_field(form.audio_select) }}
diff --git a/app/templates/stream/vod_encode/base.html b/app/templates/stream/vod_encode/base.html
index a866a11..1c39d32 100644
--- a/app/templates/stream/vod_encode/base.html
+++ b/app/templates/stream/vod_encode/base.html
@@ -36,8 +36,6 @@
         <br>
         {{ render_bootstrap_field(form.group_title) }}
         <br>
-        {{ render_bootstrap_field(form.tags) }}
-        <br>
         {{ render_bootstrap_field(form.audio_select) }}
         <br>
         {{ render_bootstrap_field(form.have_video) }}
diff --git a/app/templates/stream/vod_relay/base.html b/app/templates/stream/vod_relay/base.html
index 293247d..faae3e3 100644
--- a/app/templates/stream/vod_relay/base.html
+++ b/app/templates/stream/vod_relay/base.html
@@ -36,8 +36,6 @@
         <br>
         {{ render_bootstrap_field(form.group_title) }}
         <br>
-        {{ render_bootstrap_field(form.tags) }}
-        <br>
         {{ render_bootstrap_field(form.audio_select) }}
         <br>
         {{ render_bootstrap_field(form.have_video) }}