diff --git a/plugins/elasticsearch/lib/elasticsearch_indexed_model.rb b/plugins/elasticsearch/lib/elasticsearch_indexed_model.rb
index d3c77db..9051555 100644
--- a/plugins/elasticsearch/lib/elasticsearch_indexed_model.rb
+++ b/plugins/elasticsearch/lib/elasticsearch_indexed_model.rb
@@ -2,6 +2,8 @@ module ElasticsearchIndexedModel
 
   def self.included base
     base.send :include, Elasticsearch::Model
+    base.send :include, Elasticsearch::Model::Callbacks
+
     base.send :index_name, "#{Rails.env}_#{base.index_name}"
     base.extend ClassMethods
     base.class_eval do
diff --git a/plugins/elasticsearch/lib/ext/text_article.rb b/plugins/elasticsearch/lib/ext/text_article.rb
index c87c1d8..7185aee 100644
--- a/plugins/elasticsearch/lib/ext/text_article.rb
+++ b/plugins/elasticsearch/lib/ext/text_article.rb
@@ -1,3 +1,7 @@
+# REQUIRE TO LOAD DESCENDANTS FROM TEXT_ARTICLE
+require_dependency 'raw_html_article'
+require_dependency 'tiny_mce_article'
+
 require_dependency 'text_article'
 require_relative '../elasticsearch_indexed_model'
 
diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/_text_article_display.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/_text_article_display.html.erb
index 23fa3b7..7d345bf 100644
--- a/plugins/elasticsearch/views/elasticsearch_plugin/_text_article_display.html.erb
+++ b/plugins/elasticsearch/views/elasticsearch_plugin/_text_article_display.html.erb
@@ -1,5 +1,5 @@
 <div class="text_article-header">
-  <%= text_article.created_at.strftime("%d %B %Y at %H:%M") %> - <%= text_article.setting[:author_name] %> - <span class="model-label"><%= _("Community") %></span>
+  <%= text_article.created_at.strftime("%d %B %Y at %H:%M") %> - <%= "#{text_article.author.name} -" if text_article.author %> <span class="model-label"><%= _("Article") %></span>
 </div>
 <div class="body">
   <h2><%= link_to text_article.name, text_article.url %></h2>
diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/_uploaded_file_display.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/_uploaded_file_display.html.erb
index ea546f2..cae24a5 100644
--- a/plugins/elasticsearch/views/elasticsearch_plugin/_uploaded_file_display.html.erb
+++ b/plugins/elasticsearch/views/elasticsearch_plugin/_uploaded_file_display.html.erb
@@ -1,5 +1,5 @@
 <div class="uploaded_file-header">
-  <%= uploaded_file.created_at.strftime("%d %B %Y at %H:%M") %> - <%=uploaded_file.setting[:author_name]%> - <span class="model-label"><%= _("Files") %></span>
+  <%= uploaded_file.created_at.strftime("%d %B %Y at %H:%M") %> - <%= "#{uploaded_file.author.name} -" if uploaded_file.author %><span class="model-label"><%= _("Files") %></span>
 </div>
 <div class="body">
   <h2><%= link_to uploaded_file.name, uploaded_file.url %></h2>
--
libgit2 0.21.2