diff --git a/components/Event.vue b/components/Event.vue
index 0383b5bd..d44b8989 100644
--- a/components/Event.vue
+++ b/components/Event.vue
@@ -17,7 +17,7 @@
 
         ul.tags(v-if='showTags && event.tags')
           li(v-for='tag in event.tags' :key='tag') {{tag}}
-          li(v-if='event.comments.length') <u>{{$tc('common.comments', event.comments.length)}}</u>
+          li(v-if='event.comments') <u>{{$tc('common.comments', event.comments.length)}}</u>
 </template>
 <script>
 import { mapState, mapActions } from 'vuex'
diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index b52473df..44c47cdf 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -211,6 +211,7 @@ const eventController = {
       attributes: { exclude: ['createdAt', 'updatedAt', 'placeId' ] },
       order: [[Tag, 'weigth', 'DESC']],
       include: [
+        { model: Comment, required: false, attributes: ['id'] },
         { model: Tag, required: false },
         { model: Place, required: false, attributes: ['id', 'name', 'address'] }
       ]
diff --git a/server/api/models/event.js b/server/api/models/event.js
index 876b8a0d..b0033135 100644
--- a/server/api/models/event.js
+++ b/server/api/models/event.js
@@ -37,6 +37,10 @@ module.exports = (sequelize, DataTypes) => {
   }
 
   event.prototype.toAP = function (username, follower) {
+    const tags = this.tags && '-' + this.tags.map(t => '#' + t.tag).join(' ')
+    const content = `<b><a href='${config.baseurl}/event/${this.id}'>${this.title}</a></b> @${this.place.name}  
+      ${moment.unix(this.start_datetime).format('dddd, D MMMM (HH:mm)')}<br/>
+      ${this.description.length > 200 ? this.description.substr(0, 200) + '...' : this.description} ${tags} <br/>`
     return {
       id: `${config.baseurl}/federation/m/c_${this.id}`,
       type: 'Create',
@@ -48,7 +52,7 @@ module.exports = (sequelize, DataTypes) => {
         attributedTo: `${config.baseurl}/federation/u/${username}`,
         to: 'https://www.w3.org/ns/activitystreams#Public',
         cc: follower ? follower: [],
-      content: `<b><a href='${config.baseurl}/event/${this.id}'>${this.title}</a></b> @${this.place.name}  ${moment.unix(this.start_datetime).format('dddd, D MMMM (HH:mm)')}<br/>${this.description.length > 200 ? this.description.substr(0, 200) + '...' : this.description} - ${this.tags.map(t => '#' + t.tag).join(' ')} <br/>`
+        content
       }
     }
   }