diff --git a/db/migrate/20120101000050_create_history.rb b/db/migrate/20120101000050_create_history.rb
index 5b2885a6b..265ef6334 100644
--- a/db/migrate/20120101000050_create_history.rb
+++ b/db/migrate/20120101000050_create_history.rb
@@ -17,7 +17,10 @@ class CreateHistory < ActiveRecord::Migration
     end
     add_index :histories, [:o_id]
     add_index :histories, [:created_by_id]
-    
+    add_index :histories, [:created_at]
+    add_index :histories, [:history_object_id]
+    add_index :histories, [:history_type_id]
+
     create_table :history_types do |t|
       t.column :name,         :string, :limit => 250,   :null => false
       t.timestamps
diff --git a/db/seeds.rb b/db/seeds.rb
index bd8f16e53..8acc9626f 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1818,6 +1818,10 @@ Translation.create( :locale => 'de', :source => "Attachment", :target => "Anhang
 Translation.create( :locale => 'de', :source => "Year", :target => "Jahr", :updated_by_id => 1, :created_by_id => 1 )
 Translation.create( :locale => 'de', :source => "Month", :target => "Monat", :updated_by_id => 1, :created_by_id => 1 )
 Translation.create( :locale => 'de', :source => "Day", :target => "Tag", :updated_by_id => 1, :created_by_id => 1 )
+Translation.create( :locale => 'de', :source => "Closed", :target => "Geschlossen", :updated_by_id => 1, :created_by_id => 1 )
+Translation.create( :locale => 'de', :source => "Re-Open", :target => "Wiedereröffnet", :updated_by_id => 1, :created_by_id => 1 )
+Translation.create( :locale => 'de', :source => "Day", :target => "Tag", :updated_by_id => 1, :created_by_id => 1 )
+Translation.create( :locale => 'de', :source => "First Solution", :target => "Erstlösung", :updated_by_id => 1, :created_by_id => 1 )
 
 
 #Translation.create( :locale => 'de', :source => "", :target => "", :updated_by_id => 1, :created_by_id => 1  )
diff --git a/lib/encode.rb b/lib/encode.rb
index c404d4523..9b6af539b 100644
--- a/lib/encode.rb
+++ b/lib/encode.rb
@@ -23,7 +23,7 @@ module Encode
 
       rescue EncodingError => e
         puts "Bad encoding: #{string.inspect}"
-        string.encode!( 'UTF-8', invalid: :replace, undef: :replace, replace: '?' )
+        string = string.encode!( 'UTF-8', invalid: :replace, undef: :replace, replace: '?' )
       end
       return string
     end