Fixed entity_translation bugs