diff --git a/src/api/endpoints/class-tainacan-rest-logs-controller.php b/src/api/endpoints/class-tainacan-rest-logs-controller.php
index 4f425eb6c..bc8ed19ee 100644
--- a/src/api/endpoints/class-tainacan-rest-logs-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-logs-controller.php
@@ -111,18 +111,89 @@ class REST_Logs_Controller extends REST_Controller {
 	public function prepare_item_for_response( $item, $request ) {
 		if(!empty($item)){
 
-			if(!isset($request['fetch_only'])) {
-				$item_array = $item->_toArray();
-				return $item_array;
-			}
+			
+			if ($request['log_id']) {
+				
+				if ($item->get_log_diffs() && $item->get_value()) {
+					$item_array = $this->prepare_legacy_item_for_response($item, $request);
+				} else {
+					
+					$item_array = $item->_toArray();
+					
+					$related_object = true;
+					
+					if ($item_array['item_id']) {
+						$item = Repositories\Items::get_instance()->fetch( (int) $item_array['item_id'] );
+						if ($item instanceof Entities\Item ) {
+							$item_array['item'] = $item->_toArray();
+						}
+					}
+					if ($item_array['collection_id']) {
+						$collection = Repositories\Collections::get_instance()->fetch( (int) $item_array['collection_id'] );
+						if ($collection instanceof Entities\Item ) {
+							$item_array['collection'] = $collection->_toArray();
+						}
+					}
+					
+					if ( $item_array['object_id'] && 
+						( isset($item_array['collection_id']) && $item_array['object_id'] != $item_array['collection_id'] ) &&
+						( isset($item_array['item_id']) && $item_array['object_id'] != $item_array['item_id'] ) ) {
+						
+						if ( $item_array['object_type'] == 'Tainacan\Entities\Term' ) {
+							$related_entity = Repositories\Terms::get_instance()->fetch( (int) $item_array['object_id'] );
+						} else {
+							$related_post = get_post($item_array['object_id']);
+							$related_entity = Repository::get_entity_by_post( $related_post );
+						}
+						
+						if ($related_entity instanceof Entities\Entity ) {
+							$item_array[ strtolower($related_entity->get_repository()->get_name()) ] = $related_entity->_toArray();
+						}
+						
+					}
+					
+					if ( $item_array['action'] == 'new-attachment' ) {
+						if ( isset($item_array['new_value']['id']) ) {
+							$item_array['new_value']['url'] = wp_get_attachment_url($item_array['new_value']['id']);
+							$item_array['new_value']['thumb'] = wp_get_attachment_image_src($item_array['new_value']['id'], 'thumbnail');
+						}
+					} elseif ( $item_array['action'] == 'update' && isset( $item_array['new_value']['document_type'] ) && $item_array['new_value']['document_type'] == 'attachment' ) {
+						if ( isset($item_array['new_value']['document']) ) { 
+							$item_array['new_value']['url'] = wp_get_attachment_url($item_array['new_value']['document']);
+							$item_array['new_value']['thumb'] = wp_get_attachment_image_src($item_array['new_value']['document'], 'thumbnail');
+						}
+					}
+					
+					
+					
+					
+					return $item_array;
+					
+				}
+				
+				
+			} else {
+				
+				if(!isset($request['fetch_only'])) {
+					$item_array = $item->_toArray();
+					return $item_array;
+				}
 
-			$attributes_to_filter = $request['fetch_only'];
+				$attributes_to_filter = $request['fetch_only'];
+				
+			}
+			
+			
 
 			return $this->filter_object_by_attributes($item, $attributes_to_filter);
 		}
 
 		return $item;
 	}
+	
+	private function prepare_legacy_item_for_response($item, $request) {
+		return $item->_toArray();
+	}
 
 	/**
 	 * @param \WP_REST_Request $request
@@ -186,7 +257,7 @@ class REST_Logs_Controller extends REST_Controller {
 	 * @return bool|\WP_Error
 	 */
 	public function get_items_permissions_check( $request ) {
-		return true;
+		//return true;
 		return current_user_can('read');
 	}
 
diff --git a/src/classes/repositories/class-tainacan-logs.php b/src/classes/repositories/class-tainacan-logs.php
index 90940d623..2c6ca5ed6 100644
--- a/src/classes/repositories/class-tainacan-logs.php
+++ b/src/classes/repositories/class-tainacan-logs.php
@@ -284,8 +284,6 @@ class Logs extends Repository {
 					'title'       => $attachment->post_title,
 					'description' => $attachment->post_content,
 					'mime_type'   => $attachment->post_mime_type,
-					'url'         => wp_get_attachment_url($attachment->ID),
-					'thumb'       => wp_get_attachment_image_src($attachment->ID, 'thumbnail'),
 				];
 				
 				$log->set_new_value($prepared);
@@ -454,7 +452,7 @@ class Logs extends Repository {
 		$diff = apply_filters( 'tainacan-entity-diff', $diff, $unsaved, $old );
 		
 		$this->current_diff = $diff;
-		$this->current_action = 'update';
+		$this->current_action = 'update-metadata-value';
 		
 	}
 	
@@ -477,6 +475,7 @@ class Logs extends Repository {
 		}
 		
 		$log = new Entities\Log();
+		$log->set_action($this->current_action);
 		
 		$collection_id = method_exists($entity, 'get_collection_id') ? $entity->get_collection_id() : 'default';
 		
@@ -503,6 +502,7 @@ class Logs extends Repository {
 			if ($this->current_action == 'update') {
 				if (isset($diff['new']['document'])) {
 					$log->set_title( sprintf( __( 'Item "%s" document was updated', 'tainacan'), $entity->get_title() ) );
+					$log->set_action('update-document');
 				} else {
 					$log->set_title( sprintf( __( 'Item "%s" was updated', 'tainacan'), $entity->get_title() ) );
 				}
@@ -573,7 +573,7 @@ class Logs extends Repository {
 		$log->set_object_id($object_id);
 		$log->set_old_value($diff['old']);
 		$log->set_new_value($diff['new']);
-		$log->set_action($this->current_action);
+		
 		
 		if ( $log->validate() ) {
 			$this->insert($log);