diff --git a/src/main/scala/service/ActivityService.scala b/src/main/scala/service/ActivityService.scala
index 1fc61e4..0e5dbba 100644
--- a/src/main/scala/service/ActivityService.scala
+++ b/src/main/scala/service/ActivityService.scala
@@ -6,23 +6,23 @@
 
 trait ActivityService {
 
-  def getActivitiesByUser(activityUserName: String, isPublic: Boolean): List[Activity] = {
-    val q = Query(Activities)
+  def getActivitiesByUser(activityUserName: String, isPublic: Boolean): List[Activity] =
+    Activities
       .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
+      .filter { case (t1, t2) =>
+        if(isPublic){
+          (t1.activityUserName is activityUserName.bind) && (t2.isPrivate is false.bind)
+        } else {
+          (t1.activityUserName is activityUserName.bind)
+        }
+      }
+      .sortBy { case (t1, t2) => t1.activityId desc }
+      .map    { case (t1, t2) => t1 }
+      .take(30)
+      .list
 
-    (if(isPublic){
-      q filter { case (t1, t2) => (t1.activityUserName is activityUserName.bind) && (t2.isPrivate is false.bind) }
-    } else {
-      q filter { case (t1, t2) => t1.activityUserName is activityUserName.bind }
-    })
-    .sortBy { case (t1, t2) => t1.activityId desc }
-    .map    { case (t1, t2) => t1 }
-    .take(30)
-    .list
-  }
-  
   def getRecentActivities(): List[Activity] =
-    Query(Activities)
+    Activities
       .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
       .filter { case (t1, t2) => t2.isPrivate is false.bind }
       .sortBy { case (t1, t2) => t1.activityId desc }
diff --git a/src/main/twirl/helper/activities.scala.html b/src/main/twirl/helper/activities.scala.html
index e301980..7325f42 100644
--- a/src/main/twirl/helper/activities.scala.html
+++ b/src/main/twirl/helper/activities.scala.html
@@ -53,6 +53,7 @@
         case "merge_pullreq"     => longActivity(activity, "activity-merge.png")
         case "create_repository" => shortActivity(activity, "activity-create-repository.png")
         case "create_branch"     => shortActivity(activity, "activity-branch.png")
+        case "create_tag"        => shortActivity(activity, "activity-tag.png")
         case "fork"              => shortActivity(activity, "activity-fork.png")
         case "push"  => customActivity(activity, "activity-commit.png"){
           <div class="small activity-message">
diff --git a/src/main/webapp/assets/common/images/actrivity-tag.png b/src/main/webapp/assets/common/images/actrivity-tag.png
new file mode 100644
index 0000000..0fea83e
--- /dev/null
+++ b/src/main/webapp/assets/common/images/actrivity-tag.png
Binary files differ