diff --git a/README.md b/README.md
new file mode 100644
index 00000000..10a1137f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+Initial commit - prepare Attachments plugin to work with Joomla 4.
+
diff --git a/attachments_component/admin/config.xml b/attachments_component/admin/config.xml
index a2ecbf96..d26d9b01 100644
--- a/attachments_component/admin/config.xml
+++ b/attachments_component/admin/config.xml
@@ -65,6 +65,13 @@
       <option value="1">JYES</option>
       <option value="0">JNO</option>
     </field>
+    <field name="hide_brackets_if_empty" type="radio" default="0" class="btn-group"
+           label="ATTACH_HIDE_BRACKETS_IF_EMPTY"
+           description="ATTACH_HIDE_BRACKETS_IF_EMPTY_DESCRIPTION">
+      <option value="1">JYES</option>
+      <option value="0">JNO</option>
+    </field>
+
     <field name="show_creator_name" type="radio" default="0" class="btn-group"
            label="ATTACH_SHOW_ATTACHMENT_CREATOR"
            description="ATTACH_SHOW_ATTACHMENT_CREATOR_DESCRIPTION">
@@ -224,7 +231,12 @@
            label="ATTACH_URL_TO_REGISTER" size="65"
            description="ATTACH_URL_TO_REGISTER_DESCRIPTION">
     </field>
-
+    <field name="alternative_search_results" type="radio" default="0" class="btn-group"
+           label="ATTACH_ALTERNATIVE_SEARCH_RESULTS"
+           description="ATTACH_ALTERNATIVE_SEARCH_RESULTS_DESC">
+      <option value="1">JYES</option>
+      <option value="0">JNO</option>
+    </field>
   </fieldset>
 
   <fieldset name="security"
diff --git a/attachments_component/admin/language/en-GB/en-GB.com_attachments.ini b/attachments_component/admin/language/en-GB/en-GB.com_attachments.ini
index d585556d..0ff2addc 100644
--- a/attachments_component/admin/language/en-GB/en-GB.com_attachments.ini
+++ b/attachments_component/admin/language/en-GB/en-GB.com_attachments.ini
@@ -378,3 +378,8 @@ COM_ATTACHMENTS_N_ITEMS_PUBLISHED="%d Attachments successfully published"
 COM_ATTACHMENTS_N_ITEMS_PUBLISHED_1="Attachment successfully published"
 COM_ATTACHMENTS_N_ITEMS_UNPUBLISHED="%d Attachments successfully unpublished"
 COM_ATTACHMENTS_N_ITEMS_UNPUBLISHED_1="Attachment successfully unpublished"
+
+ATTACH_ALTERNATIVE_SEARCH_RESULTS="Alternative search results format"
+ATTACH_ALTERNATIVE_SEARCH_RESULTS_DESC="Switch to alternative search results format for searching attachments - create links to content to which attachment is connected, keep attachment detail information in result" 
+ATTACH_HIDE_BRACKETS_IF_EMPTY="Hide brackets when empty"
+ATTACH_HIDE_BRACKETS_IF_EMPTY_DESCRIPTION="Hide brackets when there is no value in 'description' or user defined fields"
diff --git a/attachments_component/site/views/attachments/tmpl/default.php b/attachments_component/site/views/attachments/tmpl/default.php
index 174e7700..5b74ba82 100644
--- a/attachments_component/site/views/attachments/tmpl/default.php
+++ b/attachments_component/site/views/attachments/tmpl/default.php
@@ -222,41 +222,68 @@
 	// Add description (maybe)
 	if ( $this->show_description ) {
 		$description = htmlspecialchars(stripslashes($attachment->description));
-		if ( JString::strlen($description) == 0)
+        $is_empty = 0;
+		if ( JString::strlen($description) == 0) {			
 			$description = '&nbsp;';
+			$is_empty = 1;			
+		}
+		
 		if ( $this->show_column_titles )
 			$html .= "<td class=\"at_description\">$description</td>";
 		else
-			$html .= "<td class=\"at_description\">[$description]</td>";
+			if ($is_empty && $this->params->get('hide_brackets_if_empty')) 
+				$html .= "<td class=\"at_description\">$description</td>";
+			else
+				$html .= "<td class=\"at_description\">[$description]</td>";		
 		}
 
 	// Show the USER DEFINED FIELDs (maybe)
 	if ( $this->show_user_field_1 ) {
 		$user_field = stripslashes($attachment->user_field_1);
-		if ( JString::strlen($user_field) == 0 )
+	    $is_empty = 0;
+		if ( JString::strlen($user_field) == 0 ) {
 			$user_field = '&nbsp;';
+			$is_empty = 1;			
+		}
+
 		if ( $this->show_column_titles )
 			$html .= "<td class=\"at_user_field\">" . $user_field . "</td>";
 		else
-			$html .= "<td class=\"at_user_field\">[" . $user_field . "]</td>";
+			if ($is_empty && $this->params->get('hide_brackets_if_empty')) 
+				$html .= "<td class=\"at_user_field\">" . $user_field . "</td>";
+			else
+				$html .= "<td class=\"at_user_field\">[" . $user_field . "]</td>";
 		}
 	if ( $this->show_user_field_2 ) {
 		$user_field = stripslashes($attachment->user_field_2);
-		if ( JString::strlen($user_field) == 0 )
+		if ( JString::strlen($user_field) == 0 ) {
 			$user_field = '&nbsp;';
+			$is_empty = 1;			
+		}
+
 		if ( $this->show_column_titles )
 			$html .= "<td class=\"at_user_field\">" . $user_field . "</td>";
 		else
-			$html .= "<td class=\"at_user_field\">[" . $user_field . "]</td>";
+			if ($is_empty && $this->params->get('hide_brackets_if_empty')) 
+				$html .= "<td class=\"at_user_field\">" . $user_field . "</td>";
+			else
+				$html .= "<td class=\"at_user_field\">[" . $user_field . "]</td>";
 		}
 	if ( $this->show_user_field_3 ) {
 		$user_field = stripslashes($attachment->user_field_3);
-		if ( JString::strlen($user_field) == 0 )
+	    $is_empty = 0;
+		if ( JString::strlen($user_field) == 0 ) {
 			$user_field = '&nbsp;';
+			$is_empty = 1;			
+		}
+
 		if ( $this->show_column_titles )
 			$html .= "<td class=\"at_user_field\">" . $user_field . "</td>";
 		else
-			$html .= "<td class=\"at_user_field\">[" . $user_field . "]</td>";
+			if ($is_empty && $this->params->get('hide_brackets_if_empty')) 
+				$html .= "<td class=\"at_user_field\">" . $user_field . "</td>";
+			else
+				$html .= "<td class=\"at_user_field\">[" . $user_field . "]</td>";
 		}
 
 	// Add the creator's username (if requested)
diff --git a/attachments_search/attachments.php b/attachments_search/attachments.php
index 19816a50..3c69a604 100644
--- a/attachments_search/attachments.php
+++ b/attachments_search/attachments.php
@@ -169,7 +169,10 @@ public function onContentSearch($text, $phrase='', $ordering='', $areas=null)
 
 		// Construct and execute the query
 		$query = $db->getQuery(true);
-		$query->select('*')->from('#__attachments AS a');
+		if ($attachParams->get('alternative_search_results', 0))
+			$query->select('a.*, c.alias, c.catid')->from('#__attachments AS a')->join('LEFT', '#__content AS c ON a.parent_id = c.id');
+		else
+		    $query->select('*')->from('#__attachments AS a');
 		$query->where("( $where ) AND a.state = 1");
 		if ( !$user->authorise('core.admin') ) {
 			$query->where('a.access in ('.$user_levels.')');
@@ -273,8 +276,26 @@ public function onContentSearch($text, $phrase='', $ordering='', $areas=null)
 
 			$parent_title = JText::_($parent->getTitle($attachment->parent_id, $parent_entity));
 
-			$attachment->section = JText::sprintf('ATTACH_ATTACHED_TO_PARENT_S_TITLE_S',
+			if ($attachParams->get('alternative_search_results', 0)) 
+				$attachment->section = '';
+			else
+			    $attachment->section = JText::sprintf('ATTACH_ATTACHED_TO_PARENT_S_TITLE_S',
 										   $parent_entity_name, $parent_title);
+										   
+			if ($attachParams->get('alternative_search_results', 0)) {
+										   
+				$url = '';
+				switch($attachment->parent_entity) {
+					case 'category': 
+							$url =  ContentHelperRoute::getCategoryRoute($attachment->catid.':'.$attachment->alias);
+							break;
+					default: // case 'article': 
+							$url = ContentHelperRoute::getArticleRoute( $attachment->parent_id.':'.$attachment->alias, $attachment->catid);
+				}
+				$attachment->href = $url;
+				$attachment->title = $attachment->parent_title;
+			
+			}
 
 			$results[$k] = $attachment;
 			$k++;