diff --git a/changelog.md b/changelog.md
index 0d95750..6b4dd39 100644
--- a/changelog.md
+++ b/changelog.md
@@ -8,6 +8,7 @@
 ### Implemented enhancements
 
 - Possibily to exclude bibtext field when adding references ([#273](https://github.com/pubs/pubs/pull/273) by [Mitsuhiro Nakamura](https://github.com/m15a))
+- Less ambiguous tag display for tags with space ([#265](https://github.com/pubs/pubs/pull/265) by [Florian Richoux](https://github.com/richoux))
 - Migration from Travis CI to Github actions ([#260](https://github.com/pubs/pubs/pull/260))
 - Allow passing named arguments to custom commands ([#241](https://github.com/pubs/pubs/pull/241) by [jkulhanek](https://github.com/jkulhanek))
 - Added support for non-standard bibtex types, e.g. @collection, @software, etc. ([#226](https://github.com/pubs/pubs/pull/226))
diff --git a/readme.md b/readme.md
index daf7c3d..1b0aa3d 100644
--- a/readme.md
+++ b/readme.md
@@ -187,4 +187,5 @@ You can access the self-documented configuration by using `pubs conf`, and all t
 - [Jonáš Kulhánek](https://github.com/jkulhanek)
 - [Dominik Stańczak](https://github.com/StanczakDominik)
 - [Gustavo José de Sousa](https://github.com/guludo)
+- [Florian Richoux](https://github.com/richoux)
 - [Mitsuhiro Nakamura](https://github.com/m15a)
diff --git a/tests/test_usecase.py b/tests/test_usecase.py
index 98f819d..13433d6 100644
--- a/tests/test_usecase.py
+++ b/tests/test_usecase.py
@@ -602,7 +602,7 @@ class TestTag(DataCommandTestCase):
                 'pubs list',
                 ]
         correct = ['',
-                   '[Page99] Page, Lawrence et al. "The PageRank Citation Ranking: Bringing Order to the Web." (1999) | network,search\n' +
+                   '[Page99] Page, Lawrence et al. "The PageRank Citation Ranking: Bringing Order to the Web." (1999) | network, search\n' +
                    '[Turing1950] Turing, Alan M "Computing machinery and intelligence" Mind (1950) \n',
                    ]
         out = self.execute_cmds(cmds)
@@ -750,9 +750,9 @@ class TestUsecase(DataCommandTestCase):
                    '[Page99] Page, Lawrence et al. "The PageRank Citation Ranking: Bringing Order to the Web." (1999) [pdf] \n',
                    '\n',
                    '',
-                   'network search\n',
+                   'network, search\n',
                    'info: Assuming search to be a tag.\n'
-                   '[Page99] Page, Lawrence et al. "The PageRank Citation Ranking: Bringing Order to the Web." (1999) [pdf] | network,search\n',
+                   '[Page99] Page, Lawrence et al. "The PageRank Citation Ranking: Bringing Order to the Web." (1999) [pdf] | network, search\n',
                   ]
 
         cmds = ['pubs init -p /paper_first',
@@ -797,7 +797,7 @@ class TestUsecase(DataCommandTestCase):
                    '',
                    '',
                    '',
-                   'search network\n',
+                   'search, network\n',
                   ]
 
         cmds = ['pubs init -p paper_first/',
@@ -810,7 +810,7 @@ class TestUsecase(DataCommandTestCase):
         out = self.execute_cmds(cmds)
 
         def clean(s):
-            return set(s.strip().split(' '))
+            return set(s.strip().split(', '))
 
         self.assertEqual(clean(correct[2]), clean(out[2]))
         self.assertEqual(clean(correct[4]), clean(out[4]))
@@ -907,7 +907,7 @@ class TestUsecase(DataCommandTestCase):
         meta = str_fixtures.turing_meta
 
         line = '[Page99] Page, Lawrence et al. "The PageRank Citation Ranking: Bringing Order to the Web." (1999) \n'
-        line1 = re.sub('\n', '| AI,computer\n', line)
+        line1 = re.sub('\n', '| AI, computer\n', line)
 
         cmds = ['pubs init',
                 'pubs add data/pagerank.bib',