diff --git a/app/models/trace.rb b/app/models/trace.rb
index 03dbeb0b3..692c20fc6 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -20,15 +20,23 @@ class Trace < ActiveRecord::Base
   end
 
   def tagstring
-    return tags.collect {|tt| tt.tag}.join(" ")
+    return tags.collect {|tt| tt.tag}.join(", ")
   end
 
   def tagstring=(s)
-    self.tags = s.split().collect {|tag|
-      tt = Tracetag.new
-      tt.tag = tag
-      tt
-    }
+    if s.include?','
+      self.tags = s.split(/\s*,\s*/).collect {|tag|
+        tt = Tracetag.new
+        tt.tag = tag
+        tt
+      }
+    else
+      self.tags = s.split().collect {|tag|
+        tt = Tracetag.new
+        tt.tag = tag
+        tt
+      }
+    end
   end
   
   def large_picture= (data)
diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb
index 4e1733148..d38fa2f4c 100644
--- a/app/views/trace/_trace.html.erb
+++ b/app/views/trace/_trace.html.erb
@@ -27,8 +27,8 @@
     <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
     <% if !trace.tags.empty? %>
       <%= t'trace.trace.in' %> 
-      <% trace.tags.each do |tag| %>
-        <%= link_to_tag tag.tag %>
+      <% trace.tags.each_with_index do |tag, index| %>
+        <%= link_to_tag tag.tag %><%=', ' if index+1 < trace.tags.count %>
       <% end %>
     <% end %>
   </td>
diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb
index 0688ec130..1001cadf9 100644
--- a/app/views/trace/view.html.erb
+++ b/app/views/trace/view.html.erb
@@ -36,8 +36,8 @@
     <td><%= t'trace.view.tags' %></td>
     <td>
     <% unless @trace.tags.empty? %>
-      <% @trace.tags.each do |tag| %>
-        <%= link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } %>
+      <% @trace.tags.each_with_index do |tag, index| %>
+        <%= link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } %><%=', ' if index+1 < @trace.tags.count %>
       <% end %>
     <% else %>
       <i><%= t'trace.view.none' %></i>