diff --git a/clearml/automation/controller.py b/clearml/automation/controller.py
index a6c0124b..cedbbf75 100644
--- a/clearml/automation/controller.py
+++ b/clearml/automation/controller.py
@@ -1331,7 +1331,7 @@ class PipelineController(object):
         existing_tasks = Task._query_tasks(
             project=[self._task.project], task_name=exact_match_regex(self._task.name),
             type=[str(self._task.task_type)],
-            system_tags=['-{}'.format(Task.archived_tag), self._tag],
+            system_tags=["__$all", self._tag, "__$not", Task.archived_tag],
             _all_=dict(fields=['runtime.{}'.format(self._runtime_property_hash)],
                        pattern=":{}".format(self._version)),
             only_fields=['id', 'runtime'],
@@ -1350,7 +1350,7 @@ class PipelineController(object):
                 existing_tasks = Task._query_tasks(
                     project=[self._task.project], task_name=exact_match_regex(self._task.name),
                     type=[str(self._task.task_type)],
-                    system_tags=['-{}'.format(Task.archived_tag), self._tag],
+                    system_tags=["__$all", self._tag, "__$not", Task.archived_tag],
                     only_fields=['id', 'hyperparams', 'runtime'],
                 )
                 found_match_version = False
diff --git a/clearml/backend_interface/task/repo/scriptinfo.py b/clearml/backend_interface/task/repo/scriptinfo.py
index 1d6fcf79..54c053b8 100644
--- a/clearml/backend_interface/task/repo/scriptinfo.py
+++ b/clearml/backend_interface/task/repo/scriptinfo.py
@@ -1148,16 +1148,13 @@ class ScriptInfo(object):
         """
 
         if ScriptInfo.is_pycharm():
-            ide_str = "PyCharm"
+            ide_str = "PyCharm{}".format("_Jupyter" if jupyter_status else "")
         elif ScriptInfo.is_vscode():
-            ide_str = "VSCode"
+            ide_str = "VSCode{}".format("_Jupyter" if jupyter_status else "")
         elif ScriptInfo.is_google_colab():
-            ide_str = "Google Colab"
+            ide_str = "Google_Colab"
         else:
-            ide_str = "Other"
-
-        if jupyter_status:
-            ide_str = "{} - Jupyter".format(ide_str)
+            ide_str = "Jupyter" if jupyter_status else ""
 
         return ide_str
 
diff --git a/clearml/backend_interface/task/task.py b/clearml/backend_interface/task/task.py
index b04994da..6a9007b6 100644
--- a/clearml/backend_interface/task/task.py
+++ b/clearml/backend_interface/task/task.py
@@ -160,7 +160,7 @@ class Task(IdObjectBase, AccessMixin, SetupUploadMixin):
         self._curr_label_stats = {}
         self._raise_on_validation_errors = raise_on_validation_errors
         self._parameters_allowed_types = tuple(set(
-            six.string_types + six.integer_types + (six.text_type, float, list, tuple, dict, type(None), Enum)
+            six.string_types + six.integer_types + (six.text_type, float, list, tuple, dict, type(None), Enum)  # noqa
         ))
         self._app_server = None
         self._files_server = None
@@ -350,7 +350,7 @@ class Task(IdObjectBase, AccessMixin, SetupUploadMixin):
         tags = [self._development_tag] if not running_remotely() else []
         extra_properties = {'system_tags': tags} if Session.check_min_api_version('2.3') else {'tags': tags}
         if not Session.check_min_api_version("2.20"):
-            extra_properties["input"] = {"view": {}}
+            extra_properties["input"] = {"view": {}}  # noqa
         req = tasks.CreateRequest(
             name=task_name or make_message('Anonymous task (%(user)s@%(host)s %(time)s)'),
             type=tasks.TaskTypeEnum(task_type),
@@ -2358,8 +2358,8 @@ class Task(IdObjectBase, AccessMixin, SetupUploadMixin):
             self.data.script = script
             self._edit(script=script)
 
-    def _set_configuration(self, name, description=None, config_type=None, config_text=None, config_dict=None,
-                           **kwargs):
+    def _set_configuration(
+            self, name, description=None, config_type=None, config_text=None, config_dict=None, **kwargs):
         # type: (str, Optional[str], Optional[str], Optional[str], Optional[Union[Mapping, list]], **Any) -> None
         """
         Set Task configuration text/dict. Multiple configurations are supported.