diff --git a/app/common b/app/common
index a7b9c82..551514f 160000
--- a/app/common
+++ b/app/common
@@ -1 +1 @@
-Subproject commit a7b9c8216fc2ddddb0873ea478abb999bbaecfb4
+Subproject commit 551514f61e364783439981435f7a3fc9bf52d7c0
diff --git a/app/service/view.py b/app/service/view.py
index 2ee6697..fcb81c4 100644
--- a/app/service/view.py
+++ b/app/service/view.py
@@ -36,6 +36,7 @@ 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()
@@ -75,6 +76,7 @@ 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 cfa8455..555d12c 100644
--- a/app/templates/service/upload_m3u.html
+++ b/app/templates/service/upload_m3u.html
@@ -23,13 +23,16 @@ Upload m3u | {{ config['PUBLIC_CONFIG'].site.title }}
                 <form action="{{ url_for('ServiceView:upload_file') }}" method="POST" class="form" role="form"
                       enctype="multipart/form-data">
                     {{ form.hidden_tag() }}
-                    <div class="col-md-4">
+                    <div class="col-md-3">
                         {{ form.file }}
                     </div>
-                    <div class="col-md-4">
-                        {{ form.type }}
+                    <div class="col-md-3">
+                        Type: {{ form.type }}
                     </div>
-                    <div class="col-md-4">
+                    <div class="col-md-3">
+                        Tags: {{ form.tags }}
+                    </div>
+                    <div class="col-md-3">
                         {{ form_field(form.submit, class="btn btn-success") }}
                     </div>
                 </form>
diff --git a/app/templates/stream/catchup/base.html b/app/templates/stream/catchup/base.html
index 56b3870..555ef9c 100644
--- a/app/templates/stream/catchup/base.html
+++ b/app/templates/stream/catchup/base.html
@@ -36,6 +36,8 @@
         <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 db00d45..8891b55 100644
--- a/app/templates/stream/cod_encode/base.html
+++ b/app/templates/stream/cod_encode/base.html
@@ -36,6 +36,8 @@
         <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 faae3e3..293247d 100644
--- a/app/templates/stream/cod_relay/base.html
+++ b/app/templates/stream/cod_relay/base.html
@@ -36,6 +36,8 @@
         <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 db00d45..8891b55 100644
--- a/app/templates/stream/encode/base.html
+++ b/app/templates/stream/encode/base.html
@@ -36,6 +36,8 @@
         <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 3985830..d39f2c1 100644
--- a/app/templates/stream/proxy/base.html
+++ b/app/templates/stream/proxy/base.html
@@ -36,6 +36,8 @@
         <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 faae3e3..293247d 100644
--- a/app/templates/stream/relay/base.html
+++ b/app/templates/stream/relay/base.html
@@ -36,6 +36,8 @@
         <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 9b35631..3aff979 100644
--- a/app/templates/stream/test_life/base.html
+++ b/app/templates/stream/test_life/base.html
@@ -36,6 +36,8 @@
         <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 4ccdefb..ccc5a2b 100644
--- a/app/templates/stream/timeshift_player/base.html
+++ b/app/templates/stream/timeshift_player/base.html
@@ -36,6 +36,8 @@
         <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 954830f..bd053fc 100644
--- a/app/templates/stream/timeshift_recorder/base.html
+++ b/app/templates/stream/timeshift_recorder/base.html
@@ -36,6 +36,8 @@
         <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 1c39d32..a866a11 100644
--- a/app/templates/stream/vod_encode/base.html
+++ b/app/templates/stream/vod_encode/base.html
@@ -36,6 +36,8 @@
         <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 faae3e3..293247d 100644
--- a/app/templates/stream/vod_relay/base.html
+++ b/app/templates/stream/vod_relay/base.html
@@ -36,6 +36,8 @@
         <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) }}