Changed tag list a bit