diff --git a/composer.lock b/composer.lock
index 1e9215c2e..b6e623fac 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1467,16 +1467,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.25",
+            "version": "1.10.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "578f4e70d117f9a90699324c555922800ac38d8c"
+                "reference": "a9f44dcea06f59d1363b100bb29f297b311fa640"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/578f4e70d117f9a90699324c555922800ac38d8c",
-                "reference": "578f4e70d117f9a90699324c555922800ac38d8c",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a9f44dcea06f59d1363b100bb29f297b311fa640",
+                "reference": "a9f44dcea06f59d1363b100bb29f297b311fa640",
                 "shasum": ""
             },
             "require": {
@@ -1525,7 +1525,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-06T12:11:37+00:00"
+            "time": "2023-08-05T09:57:55+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -4227,16 +4227,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v5.4.24",
+            "version": "v5.4.26",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64"
+                "reference": "1a44dc377ec86a50fab40d066cd061e28a6b482f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/e3c46cc5689c8782944274bb30702106ecbe3b64",
-                "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64",
+                "url": "https://api.github.com/repos/symfony/process/zipball/1a44dc377ec86a50fab40d066cd061e28a6b482f",
+                "reference": "1a44dc377ec86a50fab40d066cd061e28a6b482f",
                 "shasum": ""
             },
             "require": {
@@ -4269,7 +4269,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v5.4.24"
+                "source": "https://github.com/symfony/process/tree/v5.4.26"
             },
             "funding": [
                 {
@@ -4285,7 +4285,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-17T11:26:05+00:00"
+            "time": "2023-07-12T15:44:31+00:00"
         },
         {
             "name": "symfony/service-contracts",
diff --git a/js/onoffice-honeypot.js b/js/onoffice-honeypot.js
index dabcd3c3a..ae73d3eb0 100644
--- a/js/onoffice-honeypot.js
+++ b/js/onoffice-honeypot.js
@@ -1,23 +1,41 @@
-var form = form || {};
-form.type = form.type || '';
 jQuery(document).ready(function ($) {
-    if (honeypot_enabled['honeypotValue'] == true && form.type !== '' && form.type !== 'applicantsearch') {
-        var messageTextarea = $('textarea[name="message"]');
-        var messageInput = $('input[name="message"]');
-        if(messageTextarea.length === 1){
-            messageTextarea.attr('name', 'tmpField');
-        } else if (messageInput.length === 1)  {
-            messageInput.attr('name', 'tmpField');
-        }
-        var label = $('<label>').text('Message:').attr("class", "message");
-        var input = $('<input>').attr({
-            'type': 'text',
-            'name': 'message',
-            'class': 'message'
+    const formElements = getFormsBySpecialHtmlAttribute();
+
+    addHoneypotToForms(formElements);
+
+    function getFormsBySpecialHtmlAttribute() {
+        const formElements = [];
+        const forms = document.querySelectorAll('.oo-form, #onoffice-form');
+
+        forms.forEach(form => {
+            const dataAttr = form.getAttribute('data-applicant-form-id');
+            if (dataAttr === null) {
+                formElements.push(form);
+            }
         });
-        $("#onoffice-form").prepend(input);
-        $("#onoffice-form").prepend(label);
-        var originalInput = $('input[name="message"]');
-        originalInput.before(label, input);
+
+        return formElements;
     }
+
+    function addHoneypotToForms(formElements) {
+        formElements.forEach((formElement) => {
+            const messageTextarea = $(formElement).find('textarea[name="message"]');
+            const messageInput = $(formElement).find('input[name="message"]');
+            if (messageTextarea.length === 1) {
+                messageTextarea.attr('name', 'tmpField');
+            } else if (messageInput.length === 1)  {
+                messageInput.attr('name', 'tmpField');
+            }
+            const label = $('<label>').text('Message:').attr("class", "message");
+            const input = $('<input>').attr({
+                'type': 'text',
+                'name': 'message',
+                'class': 'message'
+            });
+            $(formElement).prepend(input);
+            $(formElement).prepend(label);
+            const originalInput = $(formElement).find('input[name="message"]');
+            originalInput.before(label, input);
+        });
+    };
 });
\ No newline at end of file
diff --git a/js/onoffice-prevent-double-form-submission.js b/js/onoffice-prevent-double-form-submission.js
new file mode 100644
index 000000000..84696a62f
--- /dev/null
+++ b/js/onoffice-prevent-double-form-submission.js
@@ -0,0 +1,24 @@
+jQuery(document).ready(function ($) {
+    const formElements = document.querySelectorAll('.oo-form, #onoffice-form');
+
+    handleFormSubmissions(formElements);
+
+    function handleFormSubmissions(formElements) {
+        formElements.forEach((formElement) => {
+            let submitted = false;
+            const submitButton = $(formElement).find('.submit_button');
+
+            $(formElement).on('submit', function (event) {
+                if (submitted) {
+                    event.preventDefault();
+                } else {
+                    submitted = true;
+                }
+            });
+
+            submitButton.on('click', function () {
+                submitButton.prop('disabled', true);
+            });
+        });
+    }
+});
diff --git a/plugin.php b/plugin.php
index e6e635143..614140f13 100644
--- a/plugin.php
+++ b/plugin.php
@@ -25,7 +25,7 @@
 Author: onOffice GmbH
 Author URI: https://en.onoffice.com/
 Description: Your connection to onOffice: This plugin enables you to have quick access to estates and forms – no additional sync with the software is needed. Consult support@onoffice.de for source code.
-Version: 4.11.1
+Version: 4.14
 License: AGPL 3+
 License URI: https://www.gnu.org/licenses/agpl-3.0
 Text Domain: onoffice-for-wp-websites
@@ -66,6 +66,8 @@
 use onOffice\WPlugin\Utility\Redirector;
 use onOffice\WPlugin\WP\WPQueryWrapper;
 
+const DEFAULT_LIMIT_CHARACTER_TITLE = 60;
+
 define('ONOFFICE_DI_CONFIG_PATH', implode(DIRECTORY_SEPARATOR, [ONOFFICE_PLUGIN_DIR, 'config', 'di-config.php']));
 
 $pDIBuilder = new ContainerBuilder();
@@ -161,7 +163,16 @@
 	}, 1, 3);
 } else {
     add_filter('document_title_parts', function ($title) use ($pDI){
-        return $pDI->get(EstateViewDocumentTitleBuilder::class)->buildDocumentTitle($title);
+		$result = $pDI->get(EstateViewDocumentTitleBuilder::class)->buildDocumentTitle($title);
+		if (strlen($result['title']) > DEFAULT_LIMIT_CHARACTER_TITLE) {
+			$shortenedTitle = substr($result['title'], 0, DEFAULT_LIMIT_CHARACTER_TITLE);
+			if (substr($result['title'], DEFAULT_LIMIT_CHARACTER_TITLE, 1) != ' ') {
+				$shortenedTitle = substr($shortenedTitle, 0, strrpos($shortenedTitle, ' '));
+			}
+			$result['title'] = $shortenedTitle;
+		}
+
+		return $result;
     }, 10, 2);
 }
 
@@ -399,11 +410,4 @@ function update_status_close_action_button_option()
 	};
 }, 500);
 
-function do_extra_enqueue_honeypot() {
-	$honeypot_enabled = get_option('onoffice-settings-honeypot');
-	wp_localize_script( 'onoffice-honeypot', 'honeypot_enabled', array(  'honeypotValue' => $honeypot_enabled ) );
-}
-
-add_action( 'wp_enqueue_scripts', 'do_extra_enqueue_honeypot' );
-
 return $pDI;
diff --git a/plugin/AddressList.php b/plugin/AddressList.php
index d12b6bf39..2a694836d 100644
--- a/plugin/AddressList.php
+++ b/plugin/AddressList.php
@@ -58,6 +58,9 @@ class AddressList
 		'emailprivate',
 		'emailbusiness',
 		'email',
+		'faxprivate',
+		'faxbusiness',
+		'fax',
 	];
 
 	const DEFAULT_FIELDS_REPLACE = [
diff --git a/plugin/DataView/DataListView.php b/plugin/DataView/DataListView.php
index c0232b94f..57cdfcc13 100644
--- a/plugin/DataView/DataListView.php
+++ b/plugin/DataView/DataListView.php
@@ -70,6 +70,9 @@ class DataListView
 	/** */
 	const SORT_BY_STANDARD_VALUES = 'sortby';
 
+	/** */
+	const SHOW_PRICE_ON_REQUEST = '1';
+
 	/** @var int */
 	private $_id = null;
 
@@ -145,9 +148,13 @@ class DataListView
 	/** @var string */
 	private $_showReferenceEstate = '0';
 
+	/** @var bool */
+	private $_showMap = false;
+
 	/** @var bool */
 	private $_showPriceOnRequest = false;
 
+
 	/**
 	 *
 	 * @param int $id
@@ -214,6 +221,14 @@ public function getExpose(): string
 	public function getAddressFields(): array
 		{ return $this->_addressFields; }
 
+	/** @return bool */
+	public function getShowMap(): bool
+		{ return (bool) $this->_showMap; }
+
+	/** @param bool $showMap */
+	public function setShowMap(bool $showMap)
+		{ $this->_showMap = $showMap; }
+
 	/** @param bool $random */
 	public function setRandom(bool $random)
 		{ $this->_random = $random; }
diff --git a/plugin/DataView/DataListViewFactory.php b/plugin/DataView/DataListViewFactory.php
index 796bfe7f2..b85b28161 100644
--- a/plugin/DataView/DataListViewFactory.php
+++ b/plugin/DataView/DataListViewFactory.php
@@ -81,6 +81,7 @@ public function createListViewByRow(array $row): DataViewFilterableFields
 		$pListView->setSortByUserDefinedDirection((int)$row['sortByUserDefinedDirection']);
 		$pListView->setSortByUserValues($row[DataListView::SORT_BY_USER_VALUES]);
 		$pListView->setShowReferenceStatus($row['show_reference_estate'] ?? 1);
+		$pListView->setShowMap($row['show_map']);
 		$pListView->setShowPriceOnRequest((bool)$row['show_price_on_request']);
 
 		$geoFieldsAll = [
diff --git a/plugin/DataView/DataSimilarEstatesSettingsHandler.php b/plugin/DataView/DataSimilarEstatesSettingsHandler.php
index 4aeda2d09..f86b18375 100644
--- a/plugin/DataView/DataSimilarEstatesSettingsHandler.php
+++ b/plugin/DataView/DataSimilarEstatesSettingsHandler.php
@@ -133,5 +133,8 @@ private function configureDataSimilarEstatesSettings(DataViewSimilarEstates $pDa
 				$pDataViewSimilar->getCustomLabels());
 		$pDataViewSimilar->setShowPriceOnRequest
 			($row[DataViewSimilarEstates::FIELD_PRICE_ON_REQUEST] ?? false);
+		$pDataViewSimilar->setPictureTypes
+			($row[DataViewSimilarEstates::PICTURES] ??
+				$pDataViewSimilar->getPictureTypes());
 	}
 }
diff --git a/plugin/DataView/DataSimilarView.php b/plugin/DataView/DataSimilarView.php
index dd744294f..fdcefc2df 100644
--- a/plugin/DataView/DataSimilarView.php
+++ b/plugin/DataView/DataSimilarView.php
@@ -40,6 +40,9 @@ class DataSimilarView
 	/** */
 	const ENABLE_SIMILAR_ESTATES = 'enablesimilarestates';
 
+	/** */
+	const PICTURES = 'pictures';
+
 	/** @var string[] */
 	private $_fields = [
 		'Id',
diff --git a/plugin/DataView/DataViewSimilarEstates.php b/plugin/DataView/DataViewSimilarEstates.php
index 26c9e8fde..1bbe62ff0 100644
--- a/plugin/DataView/DataViewSimilarEstates.php
+++ b/plugin/DataView/DataViewSimilarEstates.php
@@ -70,6 +70,9 @@ class DataViewSimilarEstates
 	/** */
 	const FIELD_SIMILAR_ESTATES_TEMPLATE = 'similar_estates_template';
 
+	/** */
+	const PICTURES = 'pictures';
+
 	/** */
 	const FIELD_PRICE_ON_REQUEST = 'show_price_on_request';
 
@@ -97,6 +100,9 @@ class DataViewSimilarEstates
 	/** @var array */
 	private $_customLabel = [];
 
+	/** @var string[] */
+	private $_pictureTypes = [];
+
 	/** @var bool */
 	private $_showPriceOnRequest = false;
 
@@ -162,7 +168,11 @@ public function getName(): string
 
 	/** @return array */
 	public function getPictureTypes(): array
-		{ return [ImageTypes::TITLE]; }
+		{ return $this->_pictureTypes; }
+
+	/** @param array $pictureTypes */
+	public function setPictureTypes(array $pictureTypes)
+		{ $this->_pictureTypes = $pictureTypes; }
 
 	/** @return string */
 	public function getTemplate(): string
diff --git a/plugin/EstateList.php b/plugin/EstateList.php
index 58099fe3f..ab2496282 100644
--- a/plugin/EstateList.php
+++ b/plugin/EstateList.php
@@ -64,6 +64,8 @@
 class EstateList
 	implements EstateListBase
 {
+	const DEFAULT_LIMIT_CHARACTER_DESCRIPTION = 150;
+
 	/** @var array */
 	private $_records = [];
 
@@ -217,6 +219,7 @@ private function loadRecords(int $currentPage)
 		$estateParametersRaw = $this->getEstateParameters($currentPage, false);
 		$estateParametersRaw['data'] = $this->_pEnvironment->getEstateStatusLabel()->getFieldsByPrio();
 		$estateParametersRaw['data'] []= 'vermarktungsart';
+		$estateParametersRaw['data'] []= 'preisAufAnfrage';
 		$pApiClientActionRawValues = clone $this->_pApiClientAction;
 		$pApiClientActionRawValues->setParameters($estateParametersRaw);
 		$pApiClientActionRawValues->addRequestToQueue()->sendRequests();
@@ -332,7 +335,7 @@ private function getEstateParameters(int $currentPage, bool $formatOutput)
 			];
 		}
 
-		if ($this->enableShowPriceOnRequestText()) {
+		if ($this->enableShowPriceOnRequestText() && !isset($requestParams['data']['preisAufAnfrage'])) {
 			$requestParams['data'][] = 'preisAufAnfrage';
 		}
 		if ($pListView->getName() === 'detail') {
@@ -484,17 +487,22 @@ public function estateIterator($modifier = EstateViewFieldModifierTypes::MODIFIE
 		if (!empty($fieldWaehrung['permittedvalues']) && !empty($recordModified['waehrung']) && isset($recordModified['waehrung']) ) {
 			$recordModified['codeWaehrung'] = array_search($recordModified['waehrung'], $fieldWaehrung['permittedvalues']);
 		}
-		$recordRaw = $this->_recordsRaw[$this->_currentEstate['id']]['elements'];
+		$recordRaw = $this->_recordsRaw[$this->_currentEstate['id']]['elements'] ?? [];
 
 		if ($this->getShowEstateMarketingStatus()) {
 			$pEstateStatusLabel = $this->_pEnvironment->getEstateStatusLabel();
 			$recordModified['vermarktungsstatus'] = $pEstateStatusLabel->getLabel($recordRaw);
 		}
 
+		if ($modifier === EstateViewFieldModifierTypes::MODIFIER_TYPE_MAP && $this->_pDataView instanceof DataListView) {
+			$recordModified['showGoogleMap'] = $this->getShowMapConfig();
+		}
+
 		if ( $checkEstateIdRequestGuard && $this->_pWPOptionWrapper->getOption( 'onoffice-settings-title-and-description' ) == 0 ) {
 			add_action( 'wp_head', function () use ( $recordModified )
 			{
-				echo '<meta name="description" content="' . esc_attr( $recordModified["objektbeschreibung"] ?? null ) . '" />';
+				echo '<meta name="description" content="' . esc_attr(isset($recordModified["objektbeschreibung"])
+					? $this->limit_characters($recordModified["objektbeschreibung"]) : null) . '" />';
 			} );
 		}
 		$recordModified = new ArrayContainerEscape($recordModified);
@@ -503,13 +511,15 @@ public function estateIterator($modifier = EstateViewFieldModifierTypes::MODIFIE
 			$recordModified['multiParkingLot'] = $parking->renderParkingLot($recordModified, $recordModified);
 		}
 
-		if($this->enableShowPriceOnRequestText()){
-			$priceFields = ['kaufpreis', 'erbpacht', 'nettokaltmiete', 'warmmiete', 'pacht', 'kaltmiete',
-							'miete_pauschal', 'saisonmiete', 'wochmietbto', 'kaufpreis_pro_qm', 'mietpreis_pro_qm'];
-			foreach ($priceFields as $priceField){
-				$this->displayTextPriceOnRequest($recordModified, $priceField);
+		if ($recordRaw['preisAufAnfrage'] === DataListView::SHOW_PRICE_ON_REQUEST) {
+			if ($this->enableShowPriceOnRequestText() || isset($recordModified['preisAufAnfrage'])) {
+				$priceFields = ['kaufpreis', 'erbpacht', 'nettokaltmiete', 'warmmiete', 'pacht', 'kaltmiete',
+						'miete_pauschal', 'saisonmiete', 'wochmietbto', 'kaufpreis_pro_qm', 'mietpreis_pro_qm'];
+				foreach ($priceFields as $priceField) {
+					$this->displayTextPriceOnRequest($recordModified, $priceField);
+				}
+				unset($recordModified['preisAufAnfrage']);
 			}
-			unset($recordModified['preisAufAnfrage']);
 		}
 
 		return $recordModified;
@@ -520,7 +530,7 @@ public function estateIterator($modifier = EstateViewFieldModifierTypes::MODIFIE
 	 * @param string $field
 	 */
 	private function displayTextPriceOnRequest($recordModified, $field){
-		if($recordModified['preisAufAnfrage'] === __("Yes", "onoffice-for-wp-websites") && !empty($recordModified[$field])) {
+		if (!empty($recordModified[ $field ])) {
 			$recordModified[ $field ] = esc_html__('Price on request', 'onoffice-for-wp-websites');
 		}
 	}
@@ -533,6 +543,23 @@ public function custom_pre_get_document_title($title_parts_array, $recordModifie
 		return $title_parts_array;
 	}
 
+	/**
+	 * Set limit character for SEO meta description
+	 * @param string $text
+	 * @return string
+	 */
+	private function limit_characters(string $text): string
+	{
+		if (strlen($text) > self::DEFAULT_LIMIT_CHARACTER_DESCRIPTION) {
+			$shortenedText = substr($text, 0, self::DEFAULT_LIMIT_CHARACTER_DESCRIPTION);
+			if (substr($text, self::DEFAULT_LIMIT_CHARACTER_DESCRIPTION, 1) != ' ') {
+				$shortenedText = substr($shortenedText, 0, strrpos($shortenedText, ' '));
+			}
+			$text = $shortenedText;
+		}
+
+		return $text;
+	}
 
 	public function getRawValues(): ArrayContainerEscape
 	{
@@ -837,6 +864,18 @@ public function getVisibleFilterableFields(): array
 		return $result;
 	}
 
+	/**
+	 * @return bool
+	 */
+	private function getShowMapConfig(): bool
+	{
+		if ($this->_pDataView instanceof DataListView) {
+			return $this->_pDataView->getShowMap();
+		}
+
+		return false;
+	}
+
 	/**
 	 *
 	 */
diff --git a/plugin/Form.php b/plugin/Form.php
index d79ec32a3..d2c3791af 100644
--- a/plugin/Form.php
+++ b/plugin/Form.php
@@ -640,10 +640,11 @@ public function getFormNo()
 	 *
 	 */
 
-	public function typeFormToHoneyPot($type)
+	private function typeFormToHoneyPot($type)
 	{
-		wp_enqueue_script( 'onoffice-honeypot', plugins_url( 'js/onoffice-honeypot.js', ONOFFICE_PLUGIN_DIR . '/index.php'), array('jquery'));
-		wp_localize_script( 'onoffice-honeypot', 'form', array(  'type' => $type ) );
+		if (get_option('onoffice-settings-honeypot') == true && $type !== 'applicantsearch') {
+			wp_enqueue_script('onoffice-honeypot', plugins_url('js/onoffice-honeypot.js', ONOFFICE_PLUGIN_DIR . '/index.php'), array('jquery'));
+		}
 	}
 
 
diff --git a/plugin/Form/FormAddressCreator.php b/plugin/Form/FormAddressCreator.php
index 97f8c0b27..1fb949b82 100644
--- a/plugin/Form/FormAddressCreator.php
+++ b/plugin/Form/FormAddressCreator.php
@@ -61,6 +61,8 @@ public function __construct(
 	/**
 	 * @param FormData $pFormData
 	 * @param bool $mergeExisting
+	 * @param string $contactType
+	 * @param int|null $estateId
 	 * @return int the new (or updated) address ID
 	 * @throws ApiClientException
 	 * @throws UnknownFieldException
@@ -68,7 +70,7 @@ public function __construct(
 	 * @throws NotFoundException
 	 */
 	public function createOrCompleteAddress(
-		FormData $pFormData, bool $mergeExisting = false, string $contactType = ''): int
+		FormData $pFormData, bool $mergeExisting = false, string $contactType = '', int $estateId = null): int
 	{
 		$requestParams = $this->getAddressDataForApiCall($pFormData);
 		$requestParams['checkDuplicate'] = $mergeExisting;
@@ -82,6 +84,13 @@ public function createOrCompleteAddress(
 		if ( key_exists( 'newsletter', $requestParams ) ) {
 			unset( $requestParams['newsletter'] );
 		}
+		if (!empty($estateId)) {
+			$userName = $this->getSupervisorUsernameByEstateId($estateId);
+			if (!empty($userName)) {
+				$requestParams['Benutzer'] = $userName;
+			}
+		}
+
 		$pApiClientAction = new APIClientActionGeneric
 			($this->_pSDKWrapper, onOfficeSDK::ACTION_ID_CREATE, 'address');
 		$pApiClientAction->setParameters($requestParams);
@@ -170,4 +179,61 @@ public function getAddressDataForEmail(FormData $pFormData): array
 		}
 		return $addressData;
 	}
+
+	/**
+	 * @param int $estateId
+	 * @return string
+	 * @throws ApiClientException
+	 * @throws DependencyException
+	 * @throws NotFoundException
+	 */
+	private function getSupervisorUsernameByEstateId(int $estateId): string
+	{
+		$requestParams = [
+			'filter' => ['Id' => [['op' => '=', 'val' => $estateId]]],
+			'data' => ['benutzer'],
+		];
+
+		$pApiClientAction = new APIClientActionGeneric
+			($this->_pSDKWrapper, onOfficeSDK::ACTION_ID_READ, 'estate');
+
+		$pApiClientAction->setParameters($requestParams);
+		$pApiClientAction->addRequestToQueue();
+		$this->_pSDKWrapper->sendRequests();
+		$result = $pApiClientAction->getResultRecords();
+
+		if (!empty($result) && isset($result[0]["elements"]["benutzer"])) {
+			$userId = $result[0]["elements"]["benutzer"];
+			return $this->getUserNameById($userId);
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * @param string $userId
+	 * @return string
+	 * @throws ApiClientException
+	 * @throws DependencyException
+	 * @throws NotFoundException
+	 */
+	private function getUserNameById(string $userId): string
+	{
+		$pApiClientAction = new APIClientActionGeneric
+			($this->_pSDKWrapper, onOfficeSDK::ACTION_ID_GET, 'users');
+
+		$pApiClientAction->addRequestToQueue();
+		$this->_pSDKWrapper->sendRequests();
+		$result = $pApiClientAction->getResultRecords();
+
+		$userResult = array_values(array_filter($result, function($item) use ($userId) {
+			return $item['id'] == $userId && isset($item["elements"]["username"]);
+		}));
+
+		if (!empty($userResult)) {
+			return $userResult[0]["elements"]["username"];
+		} else {
+			return '';
+		}
+	}
 }
diff --git a/plugin/Form/FormPostInterestConfiguration.php b/plugin/Form/FormPostInterestConfiguration.php
index 8801f0ab4..9fd7b1a61 100644
--- a/plugin/Form/FormPostInterestConfiguration.php
+++ b/plugin/Form/FormPostInterestConfiguration.php
@@ -25,6 +25,7 @@
 
 use onOffice\WPlugin\Field\SearchcriteriaFields;
 use onOffice\WPlugin\SDKWrapper;
+use onOffice\WPlugin\WP\WPQueryWrapper;
 
 /**
  *
@@ -66,4 +67,12 @@ public function getSearchcriteriaFields(): SearchcriteriaFields;
 	 */
 
 	 public function getNewsletterAccepted(): bool;
+
+	/**
+	 *
+	 * @return WPQueryWrapper
+	 *
+	 */
+
+	public function getWPQueryWrapper(): WPQueryWrapper;
 }
\ No newline at end of file
diff --git a/plugin/Form/FormPostInterestConfigurationDefault.php b/plugin/Form/FormPostInterestConfigurationDefault.php
index f37c99cc4..2c33e3987 100644
--- a/plugin/Form/FormPostInterestConfigurationDefault.php
+++ b/plugin/Form/FormPostInterestConfigurationDefault.php
@@ -25,6 +25,7 @@
 
 use onOffice\WPlugin\Field\SearchcriteriaFields;
 use onOffice\WPlugin\SDKWrapper;
+use onOffice\WPlugin\WP\WPQueryWrapper;
 
 
 /**
@@ -43,23 +44,28 @@ class FormPostInterestConfigurationDefault
 	/** @var SearchcriteriaFields */
 	private $_pSearchcriteriaFields;
 
+	/** @var WPQueryWrapper */
+	private $_pWPQueryWrapper = null;
 
 	/**
 	 *
 	 * @param SDKWrapper $pSDKWrapper
 	 * @param FormAddressCreator $pFormAddressCreator
 	 * @param SearchcriteriaFields $pSearchcriteriaFields
+	 * @param WPQueryWrapper $pWPQueryWrapper
 	 *
 	 */
 
 	public function __construct(
 		SDKWrapper $pSDKWrapper,
 		FormAddressCreator $pFormAddressCreator,
-		SearchcriteriaFields $pSearchcriteriaFields)
+		SearchcriteriaFields $pSearchcriteriaFields,
+		WPQueryWrapper $pWPQueryWrapper)
 	{
 		$this->_pSDKWrapper = $pSDKWrapper;
 		$this->_pFormAddressCreator = $pFormAddressCreator;
 		$this->_pSearchcriteriaFields = $pSearchcriteriaFields;
+		$this->_pWPQueryWrapper = $pWPQueryWrapper;
 	}
 
 
@@ -106,4 +112,16 @@ public function getNewsletterAccepted(): bool
 	{
 		return filter_var( $_POST['newsletter'] ?? null, FILTER_SANITIZE_STRING ) === 'y';
 	}
+
+
+	/**
+	 *
+	 * @return WPQueryWrapper
+	 *
+	 */
+
+	public function getWPQueryWrapper(): WPQueryWrapper
+	{
+		return $this->_pWPQueryWrapper;
+	}
 }
diff --git a/plugin/Form/FormPostInterestConfigurationTest.php b/plugin/Form/FormPostInterestConfigurationTest.php
index aa54f853a..7809e4701 100644
--- a/plugin/Form/FormPostInterestConfigurationTest.php
+++ b/plugin/Form/FormPostInterestConfigurationTest.php
@@ -25,6 +25,7 @@
 
 use onOffice\WPlugin\Field\SearchcriteriaFields;
 use onOffice\WPlugin\SDKWrapper;
+use onOffice\WPlugin\WP\WPQueryWrapper;
 
 
 /**
@@ -46,22 +47,28 @@ class FormPostInterestConfigurationTest
 	/** @var bool */
 	private $_newsletterAccepted = false;
 
+	/** @var WPQueryWrapper */
+	private $_pWPQueryWrapper;
+
 	/**
 	 *
 	 * @param SDKWrapper $pSDKWrapper
 	 * @param FormAddressCreator $pFormAddressCreator
 	 * @param SearchcriteriaFields $pSearchcriteriaFields
+	 * @param WPQueryWrapper $pWPQueryWrapper
 	 *
 	 */
 
 	public function __construct(
 		SDKWrapper $pSDKWrapper,
 		FormAddressCreator $pFormAddressCreator,
-		SearchcriteriaFields $pSearchcriteriaFields)
+		SearchcriteriaFields $pSearchcriteriaFields,
+		WPQueryWrapper $pWPQueryWrapper)
 	{
 		$this->_pSDKWrapper = $pSDKWrapper;
 		$this->_pFormAddressCreator = $pFormAddressCreator;
 		$this->_pSearchcriteriaFields = $pSearchcriteriaFields;
+		$this->_pWPQueryWrapper = $pWPQueryWrapper;
 	}
 
 
@@ -121,4 +128,15 @@ public function setNewsletterAccepted( bool $newsletterAccepted )
 	{
 		$this->_newsletterAccepted = $newsletterAccepted;
 	}
+
+	/**
+	 *
+	 * @return WPQueryWrapper
+	 *
+	 */
+
+	public function getWPQueryWrapper(): WPQueryWrapper
+	{
+		return $this->_pWPQueryWrapper;
+	}
 }
diff --git a/plugin/Form/FormPostOwnerConfiguration.php b/plugin/Form/FormPostOwnerConfiguration.php
index 10d536935..a808df1ad 100644
--- a/plugin/Form/FormPostOwnerConfiguration.php
+++ b/plugin/Form/FormPostOwnerConfiguration.php
@@ -25,6 +25,7 @@
 
 use onOffice\WPlugin\Controller\InputVariableReader;
 use onOffice\WPlugin\SDKWrapper;
+use onOffice\WPlugin\WP\WPQueryWrapper;
 
 /**
  *
@@ -73,4 +74,13 @@ public function getFormAddressCreator(): FormAddressCreator;
 	 *
 	 */
 	 public function getNewsletterAccepted(): bool;
+
+
+	/**
+	 *
+	 * @return WPQueryWrapper
+	 *
+	 */
+
+	 public function getWPQueryWrapper(): WPQueryWrapper;
 }
diff --git a/plugin/Form/FormPostOwnerConfigurationDefault.php b/plugin/Form/FormPostOwnerConfigurationDefault.php
index f932eda86..9efe6b127 100644
--- a/plugin/Form/FormPostOwnerConfigurationDefault.php
+++ b/plugin/Form/FormPostOwnerConfigurationDefault.php
@@ -26,6 +26,7 @@
 use onOffice\SDK\onOfficeSDK;
 use onOffice\WPlugin\Controller\InputVariableReader;
 use onOffice\WPlugin\SDKWrapper;
+use onOffice\WPlugin\WP\WPQueryWrapper;
 
 /**
  *
@@ -40,18 +41,22 @@ class FormPostOwnerConfigurationDefault
 	/** @var FormAddressCreator */
 	private $_pFormAddressCreator;
 
+	/** @var WPQueryWrapper */
+	private $_pWPQueryWrapper = null;
 
 	/**
 	 *
 	 * @param SDKWrapper $pSDKWrapper
 	 * @param FormAddressCreator $pFormAddressCreator
+	 * @param WPQueryWrapper $pWPQueryWrapper
 	 *
 	 */
 
-	public function __construct(SDKWrapper $pSDKWrapper, FormAddressCreator $pFormAddressCreator)
+	public function __construct(SDKWrapper $pSDKWrapper, FormAddressCreator $pFormAddressCreator, WPQueryWrapper $pWPQueryWrapper)
 	{
 		$this->_pSDKWrapper = $pSDKWrapper;
 		$this->_pFormAddressCreator = $pFormAddressCreator;
+		$this->_pWPQueryWrapper = $pWPQueryWrapper;
 	}
 
 
@@ -110,4 +115,16 @@ public function getNewsletterAccepted(): bool
 	{
 		return filter_var( $_POST['newsletter'] ?? null, FILTER_SANITIZE_STRING ) === 'y';
 	}
+
+
+	/**
+	 *
+	 * @return WPQueryWrapper
+	 *
+	 */
+
+	public function getWPQueryWrapper(): WPQueryWrapper
+	{
+		return $this->_pWPQueryWrapper;
+	}
 }
diff --git a/plugin/Form/FormPostOwnerConfigurationTest.php b/plugin/Form/FormPostOwnerConfigurationTest.php
index ac0e0917c..cc5a0ade3 100644
--- a/plugin/Form/FormPostOwnerConfigurationTest.php
+++ b/plugin/Form/FormPostOwnerConfigurationTest.php
@@ -27,6 +27,7 @@
 use onOffice\WPlugin\Controller\InputVariableReader;
 use onOffice\WPlugin\Controller\InputVariableReaderConfigTest;
 use onOffice\WPlugin\SDKWrapper;
+use onOffice\WPlugin\WP\WPQueryWrapper;
 
 /**
  *
@@ -47,20 +48,26 @@ class FormPostOwnerConfigurationTest
 	/** @var bool */
 	private $_newsletterAccepted = false;
 
+	/** @var WPQueryWrapper */
+	private $_pWPQueryWrapper;
+
 	/**
 	 * @param SDKWrapper $pSDKWrapper
 	 * @param FormAddressCreator $pFormAddressCreator
 	 * @param InputVariableReaderConfigTest $pInputVariableReaderConfigTest
+	 * @param WPQueryWrapper $pWPQueryWrapper
 	 */
 
 	public function __construct(
 		SDKWrapper $pSDKWrapper,
 		FormAddressCreator $pFormAddressCreator,
-		InputVariableReaderConfigTest $pInputVariableReaderConfigTest)
+		InputVariableReaderConfigTest $pInputVariableReaderConfigTest,
+		WPQueryWrapper $pWPQueryWrapper)
 	{
 		$this->_pInputVariableReaderConfigTest = $pInputVariableReaderConfigTest;
 		$this->_pFormAddressCreator = $pFormAddressCreator;
 		$this->_pSDKWrapper = $pSDKWrapper;
+		$this->_pWPQueryWrapper = $pWPQueryWrapper;
 	}
 
 
@@ -133,4 +140,16 @@ public function setNewsletterAccepted( bool $newsletterAccepted )
 	{
 		$this->_newsletterAccepted = $newsletterAccepted;
 	}
+
+
+	/**
+	 *
+	 * @return WPQueryWrapper
+	 *
+	 */
+
+	public function getWPQueryWrapper(): WPQueryWrapper
+	{
+		return $this->_pWPQueryWrapper;
+	}
 }
diff --git a/plugin/FormPostContact.php b/plugin/FormPostContact.php
index 16017c1f4..9640966f8 100644
--- a/plugin/FormPostContact.php
+++ b/plugin/FormPostContact.php
@@ -135,8 +135,10 @@ private function createAddress(FormData $pFormData)
 		$pFormConfig = $pFormData->getDataFormConfiguration();
 		$checkDuplicate = $pFormConfig->getCheckDuplicateOnCreateAddress();
 		$contactType = $pFormConfig->getContactType();
+		$pWPQuery = $this->_pFormPostContactConfiguration->getWPQueryWrapper()->getWPQuery();
+		$estateId = $pWPQuery->get('estate_id', null);
 		$addressId = $this->_pFormPostContactConfiguration->getFormAddressCreator()
-			->createOrCompleteAddress($pFormData, $checkDuplicate, $contactType);
+			->createOrCompleteAddress($pFormData, $checkDuplicate, $contactType, $estateId);
 
 		if (!$this->_pFormPostContactConfiguration->getNewsletterAccepted()) {
 			// No subscription for newsletter, which is ok
diff --git a/plugin/FormPostInterest.php b/plugin/FormPostInterest.php
index 38bc77e6b..ffe4f0894 100644
--- a/plugin/FormPostInterest.php
+++ b/plugin/FormPostInterest.php
@@ -84,9 +84,10 @@ protected function analyseFormContentByPrefix(FormData $pFormData)
 			if ( $pFormConfiguration->getCreateInterest() ) {
 				$checkduplicate = $pFormConfiguration->getCheckDuplicateOnCreateAddress();
 						$contactType = $pFormConfiguration->getContactType();
+				$pWPQuery = $this->_pFormPostInterestConfiguration->getWPQueryWrapper()->getWPQuery();
+				$estateId = $pWPQuery->get('estate_id', null);
 				$addressId = $this->_pFormPostInterestConfiguration->getFormAddressCreator()
-				                                                   ->createOrCompleteAddress( $pFormData,
-					                                                   $checkduplicate, $contactType);
+						->createOrCompleteAddress( $pFormData, $checkduplicate, $contactType, $estateId);
 				$this->createSearchcriteria( $pFormData, $addressId );
 				$this->setNewsletter( $addressId );
 			}
@@ -177,6 +178,11 @@ private function sendEmail(FormData $pFormData, string $recipient, $subject = nu
 			$requestParams['addressdata']['newsletter_aktiv'] = $this->_pFormPostInterestConfiguration
 				->getNewsletterAccepted();
 		}
+		if (isset($addressData['gdprcheckbox']) && $addressData['gdprcheckbox']) {
+			$requestParams['addressdata']['DSGVOStatus'] = "speicherungzugestimmt";
+		}
+		unset($requestParams['addressdata']['gdprcheckbox']);
+
 		$pSDKWrapper = $this->_pFormPostInterestConfiguration->getSDKWrapper();
 		$pAPIClientAction = new APIClientActionGeneric
 		($pSDKWrapper, onOfficeSDK::ACTION_ID_DO, 'contactaddress');
diff --git a/plugin/FormPostOwner.php b/plugin/FormPostOwner.php
index 7a5e6cf3b..b9f62e2f6 100644
--- a/plugin/FormPostOwner.php
+++ b/plugin/FormPostOwner.php
@@ -87,14 +87,16 @@ protected function analyseFormContentByPrefix(FormData $pFormData)
 
 		$recipient = $pDataFormConfiguration->getRecipientByUserSelection();
 		$subject = $pDataFormConfiguration->getSubject();
+		$estateData = $this->getEstateData();
 
 		try {
 			if ( $pDataFormConfiguration->getCreateOwner() ) {
 				$checkduplicate = $pDataFormConfiguration->getCheckDuplicateOnCreateAddress();
 				$contactType = $pDataFormConfiguration->getContactType();
+				$pWPQuery = $this->_pFormPostOwnerConfiguration->getWPQueryWrapper()->getWPQuery();
+				$estateId = $pWPQuery->get('estate_id', null);
 				$addressId  = $this->_pFormPostOwnerConfiguration->getFormAddressCreator()
-				                                                 ->createOrCompleteAddress( $pFormData,
-					                                                 $checkduplicate, $contactType);
+						->createOrCompleteAddress($pFormData, $checkduplicate, $contactType, $estateId);
 				$estateData = $this->getEstateData();
 				$estateId   = $this->createEstate( $estateData );
 				$this->createOwnerRelation( $estateId, $addressId );
@@ -102,7 +104,7 @@ protected function analyseFormContentByPrefix(FormData $pFormData)
 			}
 		} finally {
 			if ( null != $recipient ) {
-				$this->sendContactRequest( $recipient, $estateId ?? 0, $estateData ?? [], $subject );
+				$this->sendContactRequest( $recipient, $estateId ?? 0, $estateData, $subject );
 			}
 		}
 	}
@@ -226,6 +228,21 @@ private function createOwnerRelation(int $estateId, int $addressId)
 		}
 	}
 
+	/**
+	 * @param array $inputData
+	 * @return string
+	 */
+	private function createStringFromInputData(array $inputData): string
+	{
+		$data = [];
+
+		foreach ($inputData as $key => $value) {
+			$data []= ucfirst($key).': '.ucfirst($value);
+		}
+
+		return implode("\n", $data);
+	}
+
 	/**
 	 *
 	 * @param string $recipient
@@ -243,6 +260,11 @@ private function sendContactRequest(string $recipient, int $estateId, array $est
 		$addressData = $this->_pFormData->getAddressData($this->getFieldsCollection());
 		$values = $this->_pFormData->getValues();
 		$estateData = array_keys($estateValues);
+		$formType = $this->_pFormData->getFormtype();
+		$informationEnterFromInputOwnerForm = $this->createStringFromInputData($estateValues);
+		if (empty($estateId)) {
+			$formType .= "\n" . $informationEnterFromInputOwnerForm;
+		}
 
 		$requestParams = [
 			'addressdata' => $addressData,
@@ -250,7 +272,7 @@ private function sendContactRequest(string $recipient, int $estateId, array $est
 			'message' => $values['message'] ?? null,
 			'subject' => $subject,
 			'referrer' => $this->_pFormPostOwnerConfiguration->getReferrer(),
-			'formtype' => $this->_pFormData->getFormtype(),
+			'formtype' => $formType,
 		];
 
 		if ($estateData != []) {
@@ -265,6 +287,10 @@ private function sendContactRequest(string $recipient, int $estateId, array $est
 			$requestParams['addressdata']['newsletter_aktiv'] = $this->_pFormPostOwnerConfiguration
 				->getNewsletterAccepted();
 		}
+		if (isset($addressData['gdprcheckbox']) && $addressData['gdprcheckbox']) {
+			$requestParams['addressdata']['DSGVOStatus'] = "speicherungzugestimmt";
+		}
+		unset($requestParams['addressdata']['gdprcheckbox']);
 
 		$pSDKWrapper = $this->_pFormPostOwnerConfiguration->getSDKWrapper();
 		$pApiClientAction = new APIClientActionGeneric($pSDKWrapper, onOfficeSDK::ACTION_ID_DO,
diff --git a/plugin/Gui/AdminPageAddressListSettings.php b/plugin/Gui/AdminPageAddressListSettings.php
index c01eb4aef..3e3e9216a 100644
--- a/plugin/Gui/AdminPageAddressListSettings.php
+++ b/plugin/Gui/AdminPageAddressListSettings.php
@@ -66,6 +66,20 @@ public function __construct($pageSlug)
 		$this->setPageTitle(__('Edit Address List', 'onoffice-for-wp-websites'));
 	}
 
+	/**
+	 *
+	 */
+
+	public function renderContent()
+	{
+		if ( isset( $_GET['saved'] ) && $_GET['saved'] === 'empty' ) {
+			echo '<div class="notice notice-error is-dismissible"><p>'
+				. esc_html__( 'There was a problem saving the address. The Name field cannot be empty.', 'onoffice-for-wp-websites' )
+				. '</p><button type="button" class="notice-dismiss notice-save-view"></button></div>';
+		}
+		parent::renderContent();
+	}
+
 
 	/**
 	 *
@@ -366,7 +380,7 @@ public function doExtraEnqueues()
 	protected function checkFixedValues($row)
 	{
 		$table = RecordManager::TABLENAME_LIST_VIEW_ADDRESS;
-		$result = isset($row[$table]['name']) && $row[$table]['name'] != null;
+		$result = isset($row[$table]['name']) && !empty(trim($row[$table]['name']));
 
 		return $result;
 	}
diff --git a/plugin/Gui/AdminPageAjax.php b/plugin/Gui/AdminPageAjax.php
index e59d5a547..9df02c7df 100644
--- a/plugin/Gui/AdminPageAjax.php
+++ b/plugin/Gui/AdminPageAjax.php
@@ -155,9 +155,8 @@ protected function readFieldnamesByContent($module, FieldModuleCollection $pFiel
 		$resultByContent = array();
 		$categories = array();
 		$listTypeUnSupported = ['user', 'datei', 'redhint', 'blackhint', 'dividingline'];
-		$listFieldsUnDisplayed = ['preisAufAnfrage'];
 		foreach ($fieldnames as $key => $properties) {
-			if (in_array($properties['type'], $listTypeUnSupported) || in_array($key, $listFieldsUnDisplayed)) {
+			if (in_array($properties['type'], $listTypeUnSupported)) {
 				continue;
 			}
 			$content = $properties['content'];
diff --git a/plugin/Gui/AdminPageEstateDetail.php b/plugin/Gui/AdminPageEstateDetail.php
index 0d85ea475..9745aea94 100644
--- a/plugin/Gui/AdminPageEstateDetail.php
+++ b/plugin/Gui/AdminPageEstateDetail.php
@@ -44,7 +44,6 @@
 use stdClass;
 use function __;
 use function add_action;
-use function add_screen_option;
 use function do_accordion_sections;
 use function do_action;
 use function do_meta_boxes;
@@ -284,7 +283,6 @@ protected function generateAccordionBoxesContactPerson(FieldsCollection $pFields
 	 */
 	protected function buildForms()
 	{
-		add_screen_option('layout_columns', array('max' => 2, 'default' => 2) );
 		$pFormModelBuilder = new FormModelBuilderEstateDetailSettings();
 		$pFormModel = $pFormModelBuilder->generate($this->getPageSlug());
 		$this->addFormModel($pFormModel);
@@ -359,7 +357,6 @@ private function readAllFields(): FieldsCollection
 					(new FieldModuleCollectionDecoratorReadAddress(new FieldsCollection()))));
 		$this->getContainer()->get(FieldsCollectionBuilderShort::class)
 			->addFieldsAddressEstate($pFieldsCollection);
-		$pFieldsCollection->removeFieldByModuleAndName(onOfficeSDK::MODULE_ESTATE, 'preisAufAnfrage');
 		return $pFieldsCollection;
 	}
 
diff --git a/plugin/Gui/AdminPageEstateListSettings.php b/plugin/Gui/AdminPageEstateListSettings.php
index 9749ef4e0..ea63d86e8 100644
--- a/plugin/Gui/AdminPageEstateListSettings.php
+++ b/plugin/Gui/AdminPageEstateListSettings.php
@@ -43,7 +43,6 @@
 use onOffice\WPlugin\Record\RecordManager;
 use stdClass;
 use function __;
-use function add_screen_option;
 use function wp_enqueue_script;
 use function wp_localize_script;
 
@@ -79,7 +78,6 @@ public function __construct($pageSlug)
 
 	protected function buildForms()
 	{
-		add_screen_option('layout_columns', array('max' => 2, 'default' => 2) );
 		$pFormModelBuilder = new FormModelBuilderDBEstateListSettings();
 		$pFormModel = $pFormModelBuilder->generate($this->getPageSlug(), $this->getListViewId());
 		$this->addFormModel($pFormModel);
@@ -103,6 +101,7 @@ protected function buildForms()
 		$pInputModelFilter = $pFormModelBuilder->createInputModelFilter();
 		$pInputModelRecordsPerPage = $pFormModelBuilder->createInputModelRecordsPerPage();
 		$pInputModelShowStatus = $pFormModelBuilder->createInputModelShowStatus();
+		$pInputModelShowMap = $pFormModelBuilder->createInputModelShowMap();
 		$pInputModelShowPriceOnRequest = $pFormModelBuilder->createInputModelShowPriceOnRequest();
 		$pDataDetailViewHandler = new DataDetailViewHandler();
 		$pDataDetailView = $pDataDetailViewHandler->getDetailView();
@@ -159,6 +158,7 @@ protected function buildForms()
 		$pFormModelLayoutDesign->addInputModel($pInputModelTemplate);
 		$pFormModelLayoutDesign->addInputModel($pInputModelShowStatus);
 		$pFormModelLayoutDesign->addInputModel($pInputModelShowPriceOnRequest);
+		$pFormModelLayoutDesign->addInputModel($pInputModelShowMap);
 		$this->addFormModel($pFormModelLayoutDesign);
 
 		$pInputModelPictureTypes = $pFormModelBuilder->createInputModelPictureTypes();
diff --git a/plugin/Gui/AdminPageEstateListSettingsBase.php b/plugin/Gui/AdminPageEstateListSettingsBase.php
index 5db0f2498..ab72b7fe6 100644
--- a/plugin/Gui/AdminPageEstateListSettingsBase.php
+++ b/plugin/Gui/AdminPageEstateListSettingsBase.php
@@ -67,6 +67,11 @@ abstract class AdminPageEstateListSettingsBase
 	public function renderContent()
 	{
 		$this->validate($this->getListViewId());
+		if ( isset( $_GET['saved'] ) && $_GET['saved'] === 'empty' ) {
+			echo '<div class="notice notice-error is-dismissible"><p>'
+				. esc_html__( 'There was a problem saving the list. The Name field cannot be empty.', 'onoffice-for-wp-websites' )
+				. '</p><button type="button" class="notice-dismiss notice-save-view"></button></div>';
+		}
 		parent::renderContent();
 	}
 
@@ -146,7 +151,7 @@ protected function updateValues(array $row, stdClass $pResult, $recordId = null)
 	protected function checkFixedValues($row)
 	{
 		$table = RecordManager::TABLENAME_LIST_VIEW;
-		$result = isset($row[$table]['name']) && $row[$table]['name'] != null;
+		$result = isset($row[$table]['name']) && !empty(trim($row[$table]['name']));
 
 		return $result;
 	}
diff --git a/plugin/Gui/AdminPageEstateUnitSettings.php b/plugin/Gui/AdminPageEstateUnitSettings.php
index 318d86b5b..720816229 100644
--- a/plugin/Gui/AdminPageEstateUnitSettings.php
+++ b/plugin/Gui/AdminPageEstateUnitSettings.php
@@ -59,7 +59,6 @@ public function __construct($pageSlug)
 
 	protected function buildForms()
 	{
-		add_screen_option('layout_columns', array('max' => 2, 'default' => 2) );
 		$pFormModelBuilder = new FormModelBuilderDBEstateUnitListSettings();
 		$pFormModel = $pFormModelBuilder->generate($this->getPageSlug(), $this->getListViewId());
 		$this->addFormModel($pFormModel);
diff --git a/plugin/Gui/AdminPageFormSettingsBase.php b/plugin/Gui/AdminPageFormSettingsBase.php
index 316528ab1..ddc536e84 100644
--- a/plugin/Gui/AdminPageFormSettingsBase.php
+++ b/plugin/Gui/AdminPageFormSettingsBase.php
@@ -58,7 +58,6 @@
 use onOffice\WPlugin\WP\InstalledLanguageReader;
 use stdClass;
 use function __;
-use function add_screen_option;
 use function esc_sql;
 use function wp_enqueue_script;
 
@@ -137,7 +136,7 @@ public function __construct($pageSlug)
 	protected function checkFixedValues($row)
 	{
 		$table = RecordManager::TABLENAME_FORMS;
-		$result = isset($row[$table]['name']) && $row[$table]['name'] != null;
+		$result = isset($row[$table]['name']) && !empty(trim($row[$table]['name']));
 
 		return $result;
 	}
@@ -420,7 +419,6 @@ private function readCustomLabels(): array
 
 	protected function buildForms()
 	{
-		add_screen_option('layout_columns', array('max' => 2, 'default' => 2) );
 		$this->_pFormModelBuilder = $this->getContainer()->get(FormModelBuilderDBForm::class);
 		$this->_pFormModelBuilder->setFormType($this->getType());
 		$pFormModel = $this->_pFormModelBuilder->generate($this->getPageSlug(), $this->getListViewId());
@@ -741,6 +739,12 @@ public function renderContent()
 			                   . 'sure the name of the form is unique.', 'onoffice-for-wp-websites' )
 			     . '</p><button type="button" class="notice-dismiss notice-save-view"></button></div>';
 		}
+		if ( isset( $_GET['saved'] ) && $_GET['saved'] === 'empty' ) {
+			echo '<div class="notice notice-error is-dismissible"><p>'
+			     . esc_html__( 'There was a problem saving the form. The Name field cannot be empty.', 'onoffice-for-wp-websites' )
+			     . '</p><button type="button" class="notice-dismiss notice-save-view"></button></div>';
+		}
+
 		do_action( 'add_meta_boxes', get_current_screen()->id, null );
 		$this->generateMetaBoxes();
 
@@ -832,7 +836,7 @@ public function save_form()
 		$row                      = $this->setFixedValues( $row );
 		$checkResult              = $this->checkFixedValues( $row );
 		$pResultObject            = new stdClass();
-		$pResultObject->result    = false;
+		$pResultObject->result    = null;
 		$pResultObject->record_id = $recordId;
 
 		$row['oo_plugin_fieldconfig_form_defaults_values']   =
@@ -848,7 +852,12 @@ public function save_form()
 
 		$pageQuery   = str_replace( 'admin_page_', 'page=', $_POST['action'] );
 		$typeQuery   = '&type=' . $_POST['type'];
-		$statusQuery = $pResultObject->result ? '&saved=true' : '&saved=false';
+		$statusQuery = '&saved=false';
+		if (is_null($pResultObject->result)) {
+			$statusQuery = '&saved=empty';
+		} else if ($pResultObject->result) {
+			$statusQuery = '&saved=true';
+		}
 		$idQuery     = $pResultObject->record_id ? '&id=' . $pResultObject->record_id : '';
 
 		wp_redirect( admin_url( 'admin.php?' . $pageQuery . $typeQuery . $idQuery . $statusQuery ) );
diff --git a/plugin/Gui/AdminPageFormSettingsInquiry.php b/plugin/Gui/AdminPageFormSettingsInquiry.php
index 4ff2268e4..1054eda79 100644
--- a/plugin/Gui/AdminPageFormSettingsInquiry.php
+++ b/plugin/Gui/AdminPageFormSettingsInquiry.php
@@ -51,7 +51,7 @@ class AdminPageFormSettingsInquiry
 	protected function checkFixedValues($row)
 	{
 		$table = RecordManager::TABLENAME_FORMS;
-		$resultName = isset($row[$table]['name']) && $row[$table]['name'] != null;
+		$resultName = isset($row[$table]['name']) && !empty(trim($row[$table]['name']));
 		$resultRecipient = ($row[$table]['default_recipient'] == 0 && isset($row[$table]['recipient']) && $row[$table]['recipient'] != null)
 			|| $row[$table]['default_recipient'] == 1;
 
diff --git a/plugin/Gui/AdminPageSettingsBase.php b/plugin/Gui/AdminPageSettingsBase.php
index 7243ecf03..0d8d61410 100644
--- a/plugin/Gui/AdminPageSettingsBase.php
+++ b/plugin/Gui/AdminPageSettingsBase.php
@@ -304,7 +304,7 @@ public function save_form()
 		$row                      = $this->setFixedValues( $row );
 		$checkResult              = $this->checkFixedValues( $row );
 		$pResultObject            = new stdClass();
-		$pResultObject->result    = false;
+		$pResultObject->result    = null;
 		$pResultObject->record_id = $recordId;
 
 		$row['oo_plugin_fieldconfig_form_defaults_values']   =
@@ -322,7 +322,12 @@ public function save_form()
 		}
 
 		$pageQuery   = str_replace( 'admin_page_', 'page=', $_POST['action'] );
-		$statusQuery = $pResultObject->result ? '&saved=true' : '&saved=false';
+		$statusQuery = '&saved=false';
+		if (is_null($pResultObject->result)) {
+			$statusQuery = '&saved=empty';
+		} else if ($pResultObject->result) {
+			$statusQuery = '&saved=true';
+		}
 		$idQuery     = $pResultObject->record_id ? '&id=' . $pResultObject->record_id : '';
 
 		if ( headers_sent() ) {
diff --git a/plugin/Gui/AdminPageSimilarEstates.php b/plugin/Gui/AdminPageSimilarEstates.php
index bbe537af5..ce4af420a 100644
--- a/plugin/Gui/AdminPageSimilarEstates.php
+++ b/plugin/Gui/AdminPageSimilarEstates.php
@@ -44,7 +44,6 @@
 use stdClass;
 use function __;
 use function add_action;
-use function add_screen_option;
 use function do_action;
 use function do_meta_boxes;
 use function do_settings_sections;
@@ -86,6 +85,9 @@ class AdminPageSimilarEstates
 	/** */
 	const CUSTOM_LABELS = 'customlabels';
 
+	/** */
+	const FORM_VIEW_PICTURE_TYPES = 'viewpicturetypes';
+
 	/**
 	 * @throws DependencyException
 	 * @throws NotFoundException
@@ -125,9 +127,12 @@ public function renderContent()
 
 		echo '<div id="post-body" class="metabox-holder columns-'
 			.(1 == get_current_screen()->get_columns() ? '1' : '2').'">';
-		echo '<div class="postbox-container" id="postbox-container-2">';
+		echo '<div class="postbox-container" id="postbox-container-1">';
 		do_meta_boxes(get_current_screen()->id, 'normal', null );
 		echo '</div>';
+		echo '<div class="postbox-container" id="postbox-container-2">';
+		do_meta_boxes(get_current_screen()->id, 'side', null );
+		echo '</div>';
 		echo '<div class="clear"></div>';
 		echo '<div style="float:left;">';
 		$this->generateAccordionBoxes($pFieldsCollection);
@@ -169,7 +174,10 @@ public function generatePageMainTitle($subTitle)
 	private function generateMetaBoxes()
 	{
 		$pFormSimilarEstates = $this->getFormModelByGroupSlug(self::FORM_VIEW_SIMILAR_ESTATES);
-		$this->createMetaBoxByForm($pFormSimilarEstates, 'normal');
+		$this->createMetaBoxByForm($pFormSimilarEstates, 'side');
+
+		$pFormPictureTypes = $this->getFormModelByGroupSlug(self::FORM_VIEW_PICTURE_TYPES);
+		$this->createMetaBoxByForm($pFormPictureTypes, 'normal');
 	}
 
 	/**
@@ -193,7 +201,6 @@ protected function generateAccordionBoxes(FieldsCollection $pFieldsCollection)
 	 */
 	protected function buildForms()
 	{
-		add_screen_option('layout_columns', array('max' => 2, 'default' => 2) );
 		$pFormModelBuilder = new FormModelBuilderSimilarEstateSettings();
 		$pFormModel = $pFormModelBuilder->generate($this->getPageSlug());
 		$this->addFormModel($pFormModel);
@@ -222,6 +229,14 @@ protected function buildForms()
 		$pFormModelSimilarEstates->addInputModel($pInputModelShowPriceOnRequest);
 		$this->addFormModel($pFormModelSimilarEstates);
 
+		$pInputModelSimilarEstatesPictureTypes = $pFormModelBuilder->createInputModelPictureTypes();
+		$pFormModelPictureTypes = new FormModel();
+		$pFormModelPictureTypes->setPageSlug($this->getPageSlug());
+		$pFormModelPictureTypes->setGroupSlug(self::FORM_VIEW_PICTURE_TYPES);
+		$pFormModelPictureTypes->setLabel(__('Photo Types', 'onoffice-for-wp-websites'));
+		$pFormModelPictureTypes->addInputModel($pInputModelSimilarEstatesPictureTypes);
+		$this->addFormModel($pFormModelPictureTypes);
+
 		$pFieldsCollection = $this->readAllFields();
 		$pFieldsCollectionConverter = $this->getContainer()->get(FieldsCollectionToContentFieldLabelArrayConverter::class);
 		$fieldsEstate = $pFieldsCollectionConverter->convert($pFieldsCollection, onOfficeSDK::MODULE_ESTATE);
@@ -244,7 +259,6 @@ private function readAllFields(): FieldsCollection
 		(new FieldModuleCollectionDecoratorReadAddress(new FieldsCollection()))));
 		$this->getContainer()->get(FieldsCollectionBuilderShort::class)
 			->addFieldsAddressEstate($pFieldsCollection);
-		$pFieldsCollection->removeFieldByModuleAndName(onOfficeSDK::MODULE_ESTATE, 'preisAufAnfrage');
 		return $pFieldsCollection;
 	}
 
diff --git a/plugin/Gui/Table/EstateListTable.php b/plugin/Gui/Table/EstateListTable.php
index 15324edfe..93ead5ad2 100644
--- a/plugin/Gui/Table/EstateListTable.php
+++ b/plugin/Gui/Table/EstateListTable.php
@@ -139,7 +139,7 @@ public function prepare_items()
 		];
 
 		$hidden = ['ID', 'filterId'];
-		$sortable = [];
+		$sortable = $this->get_sortable_columns();
 
 		$this->_column_headers = [$columns, $hidden, $sortable,
 			$this->get_default_primary_column_name()];
@@ -147,6 +147,20 @@ public function prepare_items()
 		$this->fillData();
 	}
 
+	/**
+	 *
+	 */
+
+	public function get_sortable_columns()
+	{
+		$columns = array(
+			'name' => ['name', false],
+			'template' => ['template', false],
+			'list_type' => ['list_type', false],
+		);
+		return $columns;
+	}
+
 	/**
 	 *
 	 * @param object $pItem
diff --git a/plugin/Installer/DatabaseChanges.php b/plugin/Installer/DatabaseChanges.php
index 265e3a2af..f1e1f9872 100644
--- a/plugin/Installer/DatabaseChanges.php
+++ b/plugin/Installer/DatabaseChanges.php
@@ -32,6 +32,7 @@
 use onOffice\WPlugin\DataView\DataDetailViewHandler;
 use onOffice\WPlugin\Model\FormModelBuilder\FormModelBuilderEstateDetailSettings;
 use onOffice\WPlugin\Template\TemplateCall;
+use onOffice\WPlugin\Types\ImageTypes;
 use onOffice\WPlugin\Utility\__String;
 use onOffice\WPlugin\DataView\DataDetailView;
 use onOffice\WPlugin\DataView\DataSimilarView;
@@ -44,7 +45,7 @@
 class DatabaseChanges implements DatabaseChangesInterface
 {
 	/** @var int */
-	const MAX_VERSION = 39;
+	const MAX_VERSION = 41;
 
 	/** @var WPOptionWrapperBase */
 	private $_pWpOption;
@@ -287,6 +288,16 @@ public function install()
 			$dbversion = 39;
 		}
 
+		if ( $dbversion == 39 ) {
+			dbDelta($this->getCreateQueryListviews());
+			$dbversion = 40;
+		}
+
+		if ( $dbversion == 40 ) {
+			$this->updateDefaultPictureTypesForSimilarEstate();
+			$dbversion = 41;
+		}
+
 		$this->_pWpOption->updateOption( 'oo_plugin_db_version', $dbversion, true );
 	}
 
@@ -377,6 +388,7 @@ private function getCreateQueryListviews()
 			`sortByUserDefinedDirection` ENUM('0','1') NOT NULL DEFAULT '0' COMMENT 'Formulierung der Sortierrichtung: 0 means highestFirst/lowestFirt, 1 means descending/ascending',
 			`show_reference_estate` tinyint(1) NOT NULL DEFAULT '0',
 			`page_shortcode` tinytext NOT NULL,
+			`show_map` tinyint(1) NOT NULL DEFAULT '1',
 			`show_price_on_request` tinyint(1) NOT NULL DEFAULT '0',
 			PRIMARY KEY (`listview_id`),
 			UNIQUE KEY `name` (`name`)
@@ -1030,6 +1042,18 @@ public function checkAllPageIdsHaveDetailShortCode()
 	}
 
 
+	/**
+	 *
+	 */
+	private function updateDefaultPictureTypesForSimilarEstate()
+	{
+		$pDataSimilarViewOptions = get_option('onoffice-similar-estates-settings-view');
+		if(!empty($pDataSimilarViewOptions) && empty($pDataSimilarViewOptions->getDataViewSimilarEstates()->getPictureTypes())){
+			$pDataSimilarViewOptions->getDataViewSimilarEstates()->setPictureTypes([ImageTypes::TITLE]);
+			$this->_pWpOption->updateOption('onoffice-similar-estates-settings-view', $pDataSimilarViewOptions);
+		}
+	}
+
 	/**
 	 * @return void
 	 */
diff --git a/plugin/Model/FormModelBuilder/FormModelBuilderDBAddress.php b/plugin/Model/FormModelBuilder/FormModelBuilderDBAddress.php
index c0ea425e4..bd0ff484d 100644
--- a/plugin/Model/FormModelBuilder/FormModelBuilderDBAddress.php
+++ b/plugin/Model/FormModelBuilder/FormModelBuilderDBAddress.php
@@ -241,7 +241,7 @@ public function getInputModelIsFilterable()
 	{
 		$pInputModelFactoryConfig = new InputModelDBFactoryConfigAddress();
 		$pInputModelFactory = new InputModelDBFactory($pInputModelFactoryConfig);
-		$label = __('Filterable', 'onoffice-for-wp-websites');
+		$label = __('Show in search', 'onoffice-for-wp-websites');
 		$type = InputModelDBFactoryConfigEstate::INPUT_FIELD_FILTERABLE;
 		/* @var $pInputModel InputModelDB */
 		$pInputModel = $pInputModelFactory->create($type, $label, true);
diff --git a/plugin/Model/FormModelBuilder/FormModelBuilderDBEstateListSettings.php b/plugin/Model/FormModelBuilder/FormModelBuilderDBEstateListSettings.php
index 31cc78324..5162e110b 100644
--- a/plugin/Model/FormModelBuilder/FormModelBuilderDBEstateListSettings.php
+++ b/plugin/Model/FormModelBuilder/FormModelBuilderDBEstateListSettings.php
@@ -213,7 +213,7 @@ public function getInputModelIsFilterable()
 	{
 		$pInputModelFactoryConfig = new InputModelDBFactoryConfigEstate();
 		$pInputModelFactory = new InputModelDBFactory($pInputModelFactoryConfig);
-		$label = __('Filterable', 'onoffice-for-wp-websites');
+		$label = __('Show in search', 'onoffice-for-wp-websites');
 		$type = InputModelDBFactoryConfigEstate::INPUT_FIELD_FILTERABLE;
 		/* @var $pInputModel InputModelDB */
 		$pInputModel = $pInputModelFactory->create($type, $label, true);
@@ -234,7 +234,7 @@ public function getInputModelAvailableOptions()
 	{
 		$pInputModelFactoryConfig = new InputModelDBFactoryConfigEstate();
 		$pInputModelFactory = new InputModelDBFactory($pInputModelFactoryConfig);
-		$label = __('Reduce values according to selected filter', 'onoffice-for-wp-websites');
+		$label = __('Hide empty values from onOffice enterprise', 'onoffice-for-wp-websites');
 		$type = InputModelDBFactoryConfigEstate::INPUT_FIELD_AVAILABLE_OPTIONS;
 		/* @var $pInputModel InputModelDB */
 		$pInputModel = $pInputModelFactory->create($type, $label, true);
@@ -751,6 +751,25 @@ public function getInputModelCustomLabelLanguageSwitch(): InputModelDB
 		return $pInputModel;
 	}
 
+	/**
+	 *
+	 * @return InputModelDB
+	 *
+	 */
+
+	public function createInputModelShowMap()
+	{
+		$labelShowMap = __('Show estate map', 'onoffice-for-wp-websites');
+
+		$pInputModelShowMap = $this->getInputModelDBFactory()->create
+		(InputModelDBFactory::INPUT_SHOW_MAP, $labelShowMap);
+		$pInputModelShowMap->setHtmlType(InputModelOption::HTML_TYPE_CHECKBOX);
+		$pInputModelShowMap->setValue($this->getValue('show_map') ?? true);
+		$pInputModelShowMap->setValuesAvailable(1);
+
+		return $pInputModelShowMap;
+	}
+
 	/**
 	 *
 	 * @return InputModelDB
diff --git a/plugin/Model/FormModelBuilder/FormModelBuilderDBEstateUnitListSettings.php b/plugin/Model/FormModelBuilder/FormModelBuilderDBEstateUnitListSettings.php
index 0776e7acc..924192f63 100644
--- a/plugin/Model/FormModelBuilder/FormModelBuilderDBEstateUnitListSettings.php
+++ b/plugin/Model/FormModelBuilder/FormModelBuilderDBEstateUnitListSettings.php
@@ -98,8 +98,8 @@ public function generate(string $pageSlug, $listViewId = null): FormModel
 	}
 
 	/**
-	 * In unit list settings, the field options "Filterable", "Hidden"
-	 * and "Reduce values according to selected filter" has been removed.
+	 * In unit list settings, the field options "Show in search", "Hidden"
+	 * and "Hide empty values from onOffice enterprise" has been removed.
 	 * @param string $module
 	 * @param string $htmlType
 	 * @param bool $isShow
diff --git a/plugin/Model/FormModelBuilder/FormModelBuilderDBForm.php b/plugin/Model/FormModelBuilder/FormModelBuilderDBForm.php
index 39b934459..34e258f7a 100644
--- a/plugin/Model/FormModelBuilder/FormModelBuilderDBForm.php
+++ b/plugin/Model/FormModelBuilder/FormModelBuilderDBForm.php
@@ -457,7 +457,7 @@ public function getInputModelIsAvailableOptions()
 	{
 		$pInputModelFactoryConfig = new InputModelDBFactoryConfigForm();
 		$pInputModelFactory = new InputModelDBFactory($pInputModelFactoryConfig);
-		$label = __('Reduce values according to selected filter', 'onoffice-for-wp-websites');
+		$label = __('Hide empty values from onOffice enterprise', 'onoffice-for-wp-websites');
 		$type = InputModelDBFactoryConfigForm::INPUT_FORM_AVAILABLE_OPTIONS;
 		/* @var $pInputModel InputModelDB */
 		$pInputModel = $pInputModelFactory->create($type, $label, true);
diff --git a/plugin/Model/FormModelBuilder/FormModelBuilderSimilarEstateSettings.php b/plugin/Model/FormModelBuilder/FormModelBuilderSimilarEstateSettings.php
index f4ce5f564..b9dd749d4 100644
--- a/plugin/Model/FormModelBuilder/FormModelBuilderSimilarEstateSettings.php
+++ b/plugin/Model/FormModelBuilder/FormModelBuilderSimilarEstateSettings.php
@@ -39,6 +39,7 @@
 use onOffice\WPlugin\Model\InputModelOption;
 use onOffice\WPlugin\Types\FieldsCollection;
 use onOffice\WPlugin\Field\Collection\FieldsCollectionBuilderShort;
+use onOffice\WPlugin\Types\ImageTypes;
 use function __;
 use onOffice\WPlugin\WP\InstalledLanguageReader;
 use onOffice\WPlugin\Model\InputModelBuilder\InputModelBuilderCustomLabel;
@@ -431,6 +432,41 @@ public function getInputModelCustomLabelLanguageSwitch(): InputModelDB
 		return $pInputModel;
 	}
 
+	/**
+	 *
+	 * @return InputModelDB
+	 *
+	 */
+
+	public function createInputModelPictureTypes()
+	{
+		$pDataViewSimilarEstates = $this->_pDataSimilarView->getDataViewSimilarEstates();
+		$allPictureTypes = ImageTypes::getAllImageTypesTranslated();
+
+		$pInputModelPictureTypes = $this->_pInputModelSimilarViewFactory->create
+			(InputModelOptionFactorySimilarView::INPUT_PICTURE_TYPE, null, true);
+		$pInputModelPictureTypes->setHtmlType(InputModelOption::HTML_TYPE_CHECKBOX);
+		$pInputModelPictureTypes->setValuesAvailable($allPictureTypes);
+		$pictureTypes = $pDataViewSimilarEstates->getPictureTypes();
+
+		if (null == $pictureTypes)
+		{
+			$pictureTypes = array(
+				'Titelbild',
+				'Foto',
+				'Foto_gross',
+				'Panorama',
+				'Grundriss',
+				'Lageplan',
+				'Epass_Skala',
+			);
+		}
+
+		$pInputModelPictureTypes->setValue($pictureTypes);
+
+		return $pInputModelPictureTypes;
+	}
+
 	/**
 	 *
 	 * @return InputModelDB
diff --git a/plugin/Model/InputModel/InputModelDBFactory.php b/plugin/Model/InputModel/InputModelDBFactory.php
index 48cbaec2f..bc223090f 100644
--- a/plugin/Model/InputModel/InputModelDBFactory.php
+++ b/plugin/Model/InputModel/InputModelDBFactory.php
@@ -87,6 +87,8 @@ class InputModelDBFactory
 	/** */
 	const INPUT_FIELD_CONFIG = 'fieldConfig';
 
+	/** */
+	const INPUT_SHOW_MAP = 'showMap';
 
 	/** @var InputModelDBFactoryConfigBase */
 	private $_pInputModelDBFactoryConfig = null;
diff --git a/plugin/Model/InputModel/InputModelDBFactoryConfigEstate.php b/plugin/Model/InputModel/InputModelDBFactoryConfigEstate.php
index 85aaeba3e..149a177d3 100644
--- a/plugin/Model/InputModel/InputModelDBFactoryConfigEstate.php
+++ b/plugin/Model/InputModel/InputModelDBFactoryConfigEstate.php
@@ -122,6 +122,10 @@ class InputModelDBFactoryConfigEstate
 			self::KEY_TABLE => 'oo_plugin_listviews',
 			self::KEY_FIELD => 'show_price_on_request',
 		],
+		InputModelDBFactory::INPUT_SHOW_MAP => [
+			self::KEY_TABLE => 'oo_plugin_listviews',
+			self::KEY_FIELD => 'show_map',
+		],
 	];
 
 
diff --git a/plugin/Model/InputModel/InputModelOptionFactorySimilarView.php b/plugin/Model/InputModel/InputModelOptionFactorySimilarView.php
index 23ef6a147..f03c0becf 100644
--- a/plugin/Model/InputModel/InputModelOptionFactorySimilarView.php
+++ b/plugin/Model/InputModel/InputModelOptionFactorySimilarView.php
@@ -70,6 +70,9 @@ class InputModelOptionFactorySimilarView
 	/** */
 	const KEY_TYPE = 'type';
 
+	/** */
+	const INPUT_PICTURE_TYPE = DataSimilarView::PICTURES;
+
 	/** @var string */
 	private $_optionGroup = null;
 
@@ -100,6 +103,9 @@ class InputModelOptionFactorySimilarView
 		self::INPUT_FIELD_ENABLE_SIMILAR_ESTATES => [
 			self::KEY_TYPE => InputModelOption::SETTING_TYPE_BOOLEAN,
 		],
+		self::INPUT_PICTURE_TYPE => [
+			self::KEY_TYPE => InputModelOption::SETTING_TYPE_STRING,
+		],
 		self::INPUT_SHOW_PRICE_ON_REQUEST => [
 			self::KEY_TYPE => InputModelOption::SETTING_TYPE_BOOLEAN
 		]
diff --git a/plugin/Record/RecordManagerReadListViewEstate.php b/plugin/Record/RecordManagerReadListViewEstate.php
index cf02de83b..a9fcc288e 100644
--- a/plugin/Record/RecordManagerReadListViewEstate.php
+++ b/plugin/Record/RecordManagerReadListViewEstate.php
@@ -91,11 +91,14 @@ public function getRecordsSortedAlphabetically():array
         {
             $where .= "AND (name LIKE '%".esc_sql($_GET['search'])."%' OR template LIKE '%".esc_sql($_GET['search'])."%')";
         }
+        $orderBy = ( ! empty($_GET['orderby'])) ? $_GET['orderby'] : 'name';
+        $order = ( ! empty($_GET['order'])) ? $_GET['order'] : 'asc';
+
         $sql = "SELECT SQL_CALC_FOUND_ROWS {$columns}
 				FROM {$prefix}oo_plugin_listviews
 				{$join}
 				WHERE {$where}
-				ORDER BY `name` ASC
+				ORDER BY `{$orderBy}` {$order}
 				LIMIT {$this->getOffset()}, {$this->getLimit()}";
 
         $this->setFoundRows($pWpDb->get_results($sql, OBJECT));
diff --git a/plugin/ScriptLoader/ScriptLoaderGenericConfigurationDefault.php b/plugin/ScriptLoader/ScriptLoaderGenericConfigurationDefault.php
index c896cdcc9..a3d5eab7a 100644
--- a/plugin/ScriptLoader/ScriptLoaderGenericConfigurationDefault.php
+++ b/plugin/ScriptLoader/ScriptLoaderGenericConfigurationDefault.php
@@ -71,7 +71,7 @@ public function getScriptLoaderGenericConfiguration(): array
 				->setLoadInFooter(true),
 			(new IncludeFileModel($script, 'onoffice-form-preview', plugins_url('/js/onoffice-form-preview.js', $pluginPath)))
 				->setLoadInFooter(true),
-			(new IncludeFileModel($script, 'onoffice-honeypot', plugins_url('/js/onoffice-honeypot.js', $pluginPath)))
+			(new IncludeFileModel($script, 'onoffice-prevent-double-form-submission', plugins_url('/js/onoffice-prevent-double-form-submission.js', $pluginPath)))
 				->setDependencies(['jquery'])
 				->setLoadInFooter(true),
 
@@ -117,6 +117,11 @@ public function getStyleUriByVersion($styleVersion): string
         $onofficeCssStyleFilePath = get_stylesheet_directory() . '/onoffice-theme/templates/onoffice-style.css';
         if (file_exists($onofficeCssStyleFilePath))
         {
+            return get_stylesheet_directory_uri() . '/onoffice-theme/templates/onoffice-style.css';
+        }
+
+        $onofficeCssStyleFilePath = get_template_directory() . '/onoffice-theme/templates/onoffice-style.css';
+        if (file_exists($onofficeCssStyleFilePath)) {
             return get_template_directory_uri() . '/onoffice-theme/templates/onoffice-style.css';
         }
 
@@ -138,6 +143,8 @@ public function getOnOfficeStyleVersion()
             . 'onoffice-personalized' );
         $folderTemplates[ TemplateCall::TEMPLATE_FOLDER_THEME ]  = glob( get_stylesheet_directory()
             . '/onoffice-theme' );
+        $folderTemplates[ TemplateCall::TEMPLATE_FOLDER_PARENT_THEME ] = glob( get_template_directory()
+            . '/onoffice-theme' );
 
         $defaultview = 'onoffice_defaultview';
         $newstyle = 'onoffice_style';
@@ -148,6 +155,11 @@ public function getOnOfficeStyleVersion()
                 . '/onoffice-theme/templates/onoffice-style.css' ) )
                 ? $newstyle
                 : $defaultview;
+        } elseif ( ! empty( $folderTemplates[ TemplateCall::TEMPLATE_FOLDER_PARENT_THEME ] ) ) {
+            $onofficeCssStyleVersion = ! empty( glob( get_template_directory()
+                . '/onoffice-theme/templates/onoffice-style.css' ) )
+                ? $newstyle
+                : $defaultview;
         } elseif ( ! empty( $folderTemplates[ TemplateCall::TEMPLATE_FOLDER_PLUGIN ] ) ) {
             $onofficeCssStyleVersion = ! empty( glob( plugin_dir_path( ONOFFICE_PLUGIN_DIR )
                 . 'onoffice-personalized/templates/onoffice-style.css' ) )
diff --git a/plugin/Template/TemplateCall.php b/plugin/Template/TemplateCall.php
index 40ddc5d3e..20b750269 100644
--- a/plugin/Template/TemplateCall.php
+++ b/plugin/Template/TemplateCall.php
@@ -69,6 +69,7 @@ public function getTemplatesFolderInfo()
 
 	const TEMPLATE_FOLDER_THEME = 'theme';
 
+	const TEMPLATE_FOLDER_PARENT_THEME = 'parent_theme';
 
 	/** @var array */
 	private $_templates = [];
diff --git a/plugin/ViewFieldModifier/EstateViewFieldModifierTypeEstateGeoBase.php b/plugin/ViewFieldModifier/EstateViewFieldModifierTypeEstateGeoBase.php
index 312d936d4..e2d781f25 100644
--- a/plugin/ViewFieldModifier/EstateViewFieldModifierTypeEstateGeoBase.php
+++ b/plugin/ViewFieldModifier/EstateViewFieldModifierTypeEstateGeoBase.php
@@ -97,8 +97,6 @@ protected function editViewFieldsForApiGeoPosition(array $viewFields): array
 
 		if ($pos !== false) {
 			unset($viewFields[$pos]);
-			$viewFields []= 'breitengrad';
-			$viewFields []= 'laengengrad';
 		}
 
 		return $viewFields;
diff --git a/readme.txt b/readme.txt
index bd536ff67..7b6cc3e61 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,9 +2,9 @@
 Contributors: jayay, anniken1
 Tags: real estate, onoffice
 Requires at least: 4.6
-Tested up to: 6.1.1
+Tested up to: 6.3.1
 Requires PHP: 7.3
-Stable tag: 4.11.1
+Stable tag: 4.14
 License: AGPL 3.0
 License URI: https://www.gnu.org/licenses/agpl-3.0.html
 
@@ -76,6 +76,67 @@ Start editing inside the `onoffice-personalized` folder.
 
 == Changelog ==
 
+= 4.14 (2023-09-11) =
+
+**Added**
+
+* Property lists in the plugin backend are now sortable by name, template and type.
+
+**Changed**
+
+* Title tags and description tags that are too long will be shortened.
+* New address records of interested parties of a property are created with the same supervisor as the property.
+
+**Fixed**
+
+* The sending of e-mails when the send button has been pressed for several times.
+* Bug with invalid estate Ids.
+* Bug with onoffice-style.css when using a child theme.
+
+= 4.13 (2023-08-15) =
+
+**Added**
+
+* All types of images for similar properties.
+
+**Changed**
+
+* Hide coordinates of property if "Geo range search" is on.
+
+**Fixed**
+
+* Display of "Price on request" in custom templates.
+* Displaying the fax number in the contact details.
+* Sending property data by email using the owner form.
+* Text of the agreed privacy policy in emails.
+
+= 4.12.1 (2023-08-03) =
+
+**Fixed**
+
+* Error if "Preis auf Anfrage" is deactivated in onOffice enterprise
+
+= 4.12 (2023-08-02) =
+
+**Added**
+
+* An option to toggle visibility of the map for each estate list.
+* 'Price on request' option to hide prices in lists and detail view.
+
+**Changed**
+
+* Renaming a notification if name of estate list, form, etc. is empty while saving.
+* Renaming the options to add fields to the search and filter.
+
+**Fixed**
+
+* The honeypot javascript is always being loaded even when disabled.
+* Customizing labels of message field in forms doesn't work.
+
+**Removed**
+
+* Faulty options for the admistration view.
+
 = 4.11.1 (2023-05-24) =
 
 **Fixed**
diff --git a/templates.dist/form/applicantform.php b/templates.dist/form/applicantform.php
index c3dcc0e2e..10d25cfc6 100644
--- a/templates.dist/form/applicantform.php
+++ b/templates.dist/form/applicantform.php
@@ -21,7 +21,7 @@
 include(ONOFFICE_PLUGIN_DIR.'/templates.dist/fields.php');
 
 ?>
-<form method="post" id="onoffice-form">
+<form method="post" id="onoffice-form" class="oo-form oo-form-applicant">
 
 	<input type="hidden" name="oo_formid" value="<?php echo $pForm->getFormId(); ?>">
 	<input type="hidden" name="oo_formno" value="<?php echo $pForm->getFormNo(); ?>">
diff --git a/templates.dist/form/applicantsearchform.php b/templates.dist/form/applicantsearchform.php
index 31d4d04fc..dd4bf3b79 100644
--- a/templates.dist/form/applicantsearchform.php
+++ b/templates.dist/form/applicantsearchform.php
@@ -22,7 +22,7 @@
 require(implode(DIRECTORY_SEPARATOR, $pathComponents));
 
 ?>
-<form method="post" id="onoffice-form" data-applicant-form-id="<?php echo esc_attr($pForm->getFormId()); ?>">
+<form method="post" id="onoffice-form" class="oo-form oo-form-applicantsearch" data-applicant-form-id="<?php echo esc_attr($pForm->getFormId()); ?>">
 
 	<input type="hidden" name="oo_formid" value="<?php echo $pForm->getFormId(); ?>">
 	<input type="hidden" name="oo_formno" value="<?php echo $pForm->getFormNo(); ?>">
diff --git a/templates.dist/form/defaultform.php b/templates.dist/form/defaultform.php
index 1aa52c460..9d96761ee 100644
--- a/templates.dist/form/defaultform.php
+++ b/templates.dist/form/defaultform.php
@@ -30,7 +30,7 @@
     ?>
 </h3>
 
-<form method="post" id="onoffice-form">
+<form method="post" id="onoffice-form" class="oo-form oo-form-default">
 	<input type="hidden" name="oo_formid" value="<?php echo $pForm->getFormId(); ?>">
 	<input type="hidden" name="oo_formno" value="<?php echo $pForm->getFormNo(); ?>">
 	<?php if ( isset( $estateId ) ) : ?>
@@ -65,7 +65,7 @@
 		if ( in_array( $input, array( 'message' ) ) ) {
 			$isRequiredMessage = $pForm->isRequiredField( 'message' );
 			$additionMessage   = $isRequiredMessage ? '*' : '';
-			esc_html_e( 'Message', 'onoffice-for-wp-websites' );
+			echo $pForm->getFieldLabel( 'message' );
 			echo $additionMessage . ':<br>';
 			echo '<textarea name="message">' . $pForm->getFieldValue( 'message' ) . '</textarea><br>';
 			continue;
diff --git a/templates.dist/form/ownerform.php b/templates.dist/form/ownerform.php
index 36d6efd0b..b1ac72c26 100644
--- a/templates.dist/form/ownerform.php
+++ b/templates.dist/form/ownerform.php
@@ -23,7 +23,7 @@
 
 ?>
 
-<form method="post" id="onoffice-form">
+<form method="post" id="onoffice-form" class="oo-form oo-form-owner">
 
 	<input type="hidden" name="oo_formid" value="<?php echo $pForm->getFormId(); ?>">
 	<input type="hidden" name="oo_formno" value="<?php echo $pForm->getFormNo(); ?>">
@@ -57,7 +57,7 @@
 			$isRequiredMessage = $pForm->isRequiredField( 'message' );
 			$additionMessage = $isRequiredMessage ? '*' : '';
 	
-			$line = esc_html__('Message', 'onoffice-for-wp-websites').$additionMessage.':<br>';
+			$line = $pForm->getFieldLabel( 'message' ).$additionMessage.':<br>';
 			$line .= '<textarea name="message">'.$pForm->getFieldValue('message').'</textarea><br>';
 		}
 		if ($table == 'address') {
diff --git a/tests/TestClassDataListViewFactory.php b/tests/TestClassDataListViewFactory.php
index 2c3b194d8..b7c197b6f 100644
--- a/tests/TestClassDataListViewFactory.php
+++ b/tests/TestClassDataListViewFactory.php
@@ -62,7 +62,8 @@ class TestClassDataListViewFactory
 		'sortbyuservalues' => ['kaufpreis,anzahl_zimmer'],
 		'radius' => '200',
 		'show_reference_estate' => '1',
-		'show_price_on_request' => true
+		'show_price_on_request' => true,
+		'show_map' => '1'
 	];
 
 	/**
@@ -108,6 +109,8 @@ public function testCreateListViewByRow()
 		$this->assertEquals($this->_baseRow['sortbyuservalues'], $pDataListView->getSortByUserValues());
 		$this->assertEquals($this->_baseRow['show_reference_estate'], $pDataListView->getShowReferenceEstate());
 		$this->assertEquals($this->_baseRow['show_price_on_request'], $pDataListView->getShowPriceOnRequest());
+		$this->assertEquals($this->_baseRow['show_map'], $pDataListView->getShowMap());
+
 		$pDataListView->getFilterableFields();
 	}
 }
diff --git a/tests/TestClassDataViewSimilarEstates.php b/tests/TestClassDataViewSimilarEstates.php
index d5e57985a..594b2ffc7 100644
--- a/tests/TestClassDataViewSimilarEstates.php
+++ b/tests/TestClassDataViewSimilarEstates.php
@@ -104,7 +104,7 @@ public function testOverriddenFields()
 		];
 		$this->assertEquals($expectedFields, $pDataViewSimilarEstates->getFields());
 		$this->assertEquals('SimilarEstates', $pDataViewSimilarEstates->getName());
-		$this->assertEquals([ImageTypes::TITLE], $pDataViewSimilarEstates->getPictureTypes());
+		$this->assertEquals([], $pDataViewSimilarEstates->getPictureTypes());
 		$this->assertEquals('', $pDataViewSimilarEstates->getTemplate());
 	}
 
diff --git a/tests/TestClassDatabaseChanges.php b/tests/TestClassDatabaseChanges.php
index 3a9bcebaa..3f69dacc4 100644
--- a/tests/TestClassDatabaseChanges.php
+++ b/tests/TestClassDatabaseChanges.php
@@ -26,6 +26,7 @@
 use onOffice\WPlugin\DataView\DataDetailView;
 use onOffice\WPlugin\DataView\DataDetailViewHandler;
 use onOffice\WPlugin\Installer\DatabaseChanges;
+use onOffice\WPlugin\Types\ImageTypes;
 use onOffice\WPlugin\Utility\__String;
 use onOffice\WPlugin\WP\WPOptionWrapperTest;
 use onOffice\WPlugin\DataView\DataSimilarView;
@@ -117,7 +118,7 @@ public function testInstall(): array
 		$this->assertGreaterThanOrEqual(self::NUM_NEW_TABLES, count($this->_createQueries));
 
 		$dbversion = $this->_pDbChanges->getDbVersion();
-		$this->assertEquals(39, $dbversion);
+		$this->assertEquals(41, $dbversion);
 		return $this->_createQueries;
 	}
 
@@ -270,7 +271,7 @@ public function testDeleteMessageFieldApplicantSearchForm()
 	 */
 	public function testMaxVersion()
 	{
-		$this->assertEquals(39, DatabaseChanges::MAX_VERSION);
+		$this->assertEquals(41, DatabaseChanges::MAX_VERSION);
 	}
 
 
@@ -359,7 +360,6 @@ public function testUpdateShowPriceOnRequestOptionForSimilarView(): array
 		$pDataViewSimilarEstates = $pSimilarViewOptions->getDataViewSimilarEstates();
 
 		$this->assertNotContains('preisAufAnfrage', $pDataViewSimilarEstates->getFields());
-		$this->assertEquals(true, $pDataViewSimilarEstates->getShowPriceOnRequest());
 
 		return $this->_createQueries;
 	}
@@ -394,4 +394,31 @@ public function testUpdateShowPriceOnRequestOptionForDetailView(): array
 
 		return $this->_createQueries;
 	}
+
+	/**
+	 * @covers \onOffice\WPlugin\Installer\DatabaseChanges::updateDefaultPictureTypesForSimilarEstate
+	 */
+
+	public function testUpdateDefaultPictureTypesForSimilarEstate(): array
+	{
+		global $wpdb;
+		$this->_pDbChanges = new DatabaseChanges($this->_pWpOption, $wpdb);
+
+		$dataSimilarViewOptions = new \onOffice\WPlugin\DataView\DataSimilarView();
+		$dataSimilarViewOptions->name = "onoffice-default-view";
+		add_option('onoffice-similar-estates-settings-view', $dataSimilarViewOptions);
+
+		$this->_pDbChanges->deinstall();
+		add_option('oo_plugin_db_version', '40');
+		add_filter('query', [$this, 'saveCreateQuery'], 1);
+		$this->_pDbChanges->install();
+		remove_filter('query', [$this, 'saveCreateQuery'], 1);
+
+		$pSimilarViewOptions = $this->_pWpOption->getOption('onoffice-similar-estates-settings-view');
+		$pDataViewSimilarEstates = $pSimilarViewOptions->getDataViewSimilarEstates();
+
+		$this->assertEquals([ImageTypes::TITLE], $pDataViewSimilarEstates->getPictureTypes());
+
+		return $this->_createQueries;
+	}
 }
diff --git a/tests/TestClassEstateList.php b/tests/TestClassEstateList.php
index 4f4b3eb78..26b118697 100644
--- a/tests/TestClassEstateList.php
+++ b/tests/TestClassEstateList.php
@@ -827,6 +827,16 @@ public function testDisplayTextPriceOnRequest()
 		$this->assertEquals('Price on request', $result['kaltmiete']);
 	}
 
+	/**
+	 *
+	 */
+	public function testGetShowMapConfig()
+	{
+		$this->_pEstateList->loadEstates();
+		$result = $this->_pEstateList->estateIterator(EstateViewFieldModifierTypes::MODIFIER_TYPE_MAP);
+		$this->assertEquals('1', $result['showGoogleMap']);
+	}
+
 	/**
 	 *
 	 * @before
@@ -967,6 +977,7 @@ private function getDataView(): DataListView
 		$pDataView->setFilterableFields([GeoPosition::FIELD_GEO_POSITION]);
 		$pDataView->setShowPriceOnRequest(true);
 		$pDataView->setExpose('testExpose');
+		$pDataView->setShowMap(true);
 		return $pDataView;
 	}
 
diff --git a/tests/TestClassEstateViewFieldModifierTypeDefault.php b/tests/TestClassEstateViewFieldModifierTypeDefault.php
index bf612c036..19d4bf88b 100644
--- a/tests/TestClassEstateViewFieldModifierTypeDefault.php
+++ b/tests/TestClassEstateViewFieldModifierTypeDefault.php
@@ -128,8 +128,6 @@ public function testGetVisibleFields()
 			'anotherField',
 			'moreFields',
 			'Underscore_field11',
-			'laengengrad',
-			'breitengrad',
 		];
 
 		$pEstateViewFieldModifierTypeDefault = $this->getPreconfiguredFieldModifier();
@@ -153,8 +151,6 @@ public function testGetAPIFieldsWithGeo()
 			'reserviert',
 			'verkauft',
 			'vermarktungsart',
-			'breitengrad',
-			'laengengrad',
 		];
 
 		$pEstateViewFieldModifierTypeDefault = $this->getPreconfiguredFieldModifier();
diff --git a/tests/TestClassEstateViewFieldModifierTypeEstateGeoBase.php b/tests/TestClassEstateViewFieldModifierTypeEstateGeoBase.php
index 83c8d4b55..f858d9bad 100644
--- a/tests/TestClassEstateViewFieldModifierTypeEstateGeoBase.php
+++ b/tests/TestClassEstateViewFieldModifierTypeEstateGeoBase.php
@@ -72,7 +72,7 @@ public function testGetVisibleFields()
 		$viewFields = [GeoPosition::FIELD_GEO_POSITION, 'testField'];
 		$pViewFieldModifier = $this->generateMockObject($viewFields);
 
-		$expectedVisibleFields = ['breitengrad', 'laengengrad', 'testField'];
+		$expectedVisibleFields = ['testField'];
 		$this->assertEqualSets($expectedVisibleFields, $pViewFieldModifier->getVisibleFields());
 	}
 
diff --git a/tests/TestClassForm.php b/tests/TestClassForm.php
index 81adf33e8..54c2cd5bb 100644
--- a/tests/TestClassForm.php
+++ b/tests/TestClassForm.php
@@ -103,6 +103,7 @@ public function prepare()
 
 		$pDefaultValueModelToOutputConverter->expects($this->atLeastOnce())->method('getConvertedField')
 			->will($this->onConsecutiveCalls(['testValue'], ['testMulti1', 'testMulti2'], [['min' => 13.1, 'max' => 14.]]));
+		add_option('onoffice-settings-honeypot', true);
 
 		$this->_pSubject = new Form('testForm1', Form::TYPE_INTEREST, $this->_pContainer);
 	}
@@ -118,4 +119,13 @@ public function testGetFieldValueWithDefaultValue()
 		$this->assertEquals(['min' => 13.1, 'max' => 14.],
 			$this->_pSubject->getFieldValue('testRange', true));
 	}
+
+	/**
+	 *
+	 */
+	public function testTypeFormToHoneyPot()
+	{
+		$this->assertTrue(wp_script_is('onoffice-honeypot', 'enqueued'));
+		$this->assertEquals(['onoffice-honeypot'], wp_scripts()->queue);
+	}
 }
\ No newline at end of file
diff --git a/tests/TestClassFormAddressCreator.php b/tests/TestClassFormAddressCreator.php
index 34161c864..f3cfa3eaa 100644
--- a/tests/TestClassFormAddressCreator.php
+++ b/tests/TestClassFormAddressCreator.php
@@ -174,6 +174,21 @@ private function createFormData(): FormData
 		return $pFormData;
 	}
 
+	/**
+	 *
+	 */
+
+	public function testCreateOrCompleteAddressWithSupervisor()
+	{
+		$this->configureSDKWrapperMockerForAddressCreationWithSupervisor(1);
+		$this->configureSDKWrapperMockerForReadEstateByEstateId(1);
+		$this->configureSDKWrapperMockerForUserBySupervisorId(3);
+		
+		$pFormData = $this->createFormData();
+		$result = $this->_pSubject->createOrCompleteAddress($pFormData, false, 'Admin', 1);
+		$this->assertEquals(1, $result);
+	}
+
 		/**
 	 *
 	 */
@@ -223,6 +238,77 @@ private function configureSDKWrapperMockerForAddressCreation(int $id)
 		$this->addCreateAddressResponseToSKDWrapper($response);
 	}
 
+	/**
+	 *
+	 */
+
+	private function configureSDKWrapperMockerForAddressCreationWithSupervisor(int $id)
+	{
+		$response = [
+			'actionid' => 'urn:onoffice-de-ns:smart:2.5:smartml:action:create',
+			'resourceid' => '',
+			'resourcetype' => 'address',
+			'cacheable' => false,
+			'identifier' => '',
+			'data' => [
+				'meta' => ['cntabsolute' => null],
+				'records' => [
+					['id' => $id, 'type' => 'address', 'elements' => []],
+				],
+			],
+			'status' => ['errorcode' => 0, 'message' => 'OK'],
+		];
+
+		$this->addCreateAddressResponseToSKDWrapperWithSupervisor($response);
+	}
+
+	/**
+	 *
+	 */
+
+	private function configureSDKWrapperMockerForReadEstateByEstateId(int $id)
+	{
+		$response = [
+			'actionid' => 'urn:onoffice-de-ns:smart:2.5:smartml:action:read',
+			'resourceid' => '',
+			'resourcetype' => 'estate',
+			'cacheable' => true,
+			'identifier' => '',
+			'data' => [
+				'meta' => ['cntabsolute' => null],
+				'records' => [
+					['id' => $id, 'type' => 'estate', 'elements' => ['benutzer' => '3']],
+				],
+			],
+			'status' => ['errorcode' => 0, 'message' => 'OK'],
+		];
+
+		$this->readEstateResponseToSKDWrapperWithEstateId($response);
+	}
+
+	/**
+	 *
+	 */
+
+	private function configureSDKWrapperMockerForUserBySupervisorId(int $id)
+	{
+		$response = [
+			'actionid' => 'urn:onoffice-de-ns:smart:2.5:smartml:action:get',
+			'resourceid' => '',
+			'resourcetype' => 'users',
+			'cacheable' => true,
+			'identifier' => '',
+			'data' => [
+				'meta' => ['cntabsolute' => null],
+				'records' => [
+					['id' => $id, 'type' => '', 'elements' => ['username' => 'testUserName']],
+				],
+			],
+			'status' => ['errorcode' => 0, 'message' => 'OK'],
+		];
+
+		$this->readUserResponseToSKDWrapperWithSupervisorId($response);
+	}
 
 	/**
 	 *
@@ -248,4 +334,30 @@ private function addCreateAddressResponseToSKDWrapperWithContactType(array $resp
 			'ArtDaten' => 'Admin'
 		], null, $response);
 	}
+
+	private function addCreateAddressResponseToSKDWrapperWithSupervisor(array $response)
+	{
+		$this->_pSDKWrapper->addResponseByParameters(onOfficeSDK::ACTION_ID_CREATE, 'address', '', [
+			'testaddressfield1varchar' => 'testValue',
+			'testaddressfield1multiselect' => ['hut','tut'],
+			'checkDuplicate' => false,
+			'ArtDaten' => 'Admin',
+			"Benutzer" => "testUserName"
+		], null, $response);
+	}
+
+	private function readEstateResponseToSKDWrapperWithEstateId(array $response)
+	{
+		$parameters = [
+			'filter' => ['Id' => [['op' => '=', 'val' => 1]]],
+			'data' => array('benutzer'),
+		];
+
+		$this->_pSDKWrapper->addResponseByParameters(onOfficeSDK::ACTION_ID_READ, 'estate', '', $parameters, null, $response);
+	}
+
+	private function readUserResponseToSKDWrapperWithSupervisorId(array $response)
+	{
+		$this->_pSDKWrapper->addResponseByParameters(onOfficeSDK::ACTION_ID_GET, 'users', '', [], null, $response);
+	}
 }
diff --git a/tests/TestClassFormModelBuilderDBEstateListSettings.php b/tests/TestClassFormModelBuilderDBEstateListSettings.php
index e47e12830..655b1d526 100644
--- a/tests/TestClassFormModelBuilderDBEstateListSettings.php
+++ b/tests/TestClassFormModelBuilderDBEstateListSettings.php
@@ -676,4 +676,23 @@ public function testCreateInputModelShowPriceOnRequest()
 		$this->assertEquals($pInputModelDB->getValue(), '0');
 		$this->assertEquals('checkbox', $pInputModelDB->getHtmlType());
 	}
+
+	/**
+	 * @covers onOffice\WPlugin\Model\FormModelBuilder\FormModelBuilderDBEstateListSettings::createInputModelShowMap
+	 */
+	public function testCreateInputModelShowMap()
+	{
+		$pInstance = $this->getMockBuilder(FormModelBuilderDBEstateListSettings::class)
+			->disableOriginalConstructor()
+			->setMethods(['getInputModelDBFactory', 'getValue', 'getOnlyDefaultSortByFields'])
+			->getMock();
+
+		$pInstance->method('getInputModelDBFactory')->willReturn($this->_pInputModelFactoryDBEntry);
+		$pInstance->method('getValue')->willReturn('1');
+
+		$pInputModelDB = $pInstance->createInputModelShowMap();
+		$this->assertInstanceOf(InputModelDB::class, $pInputModelDB);
+		$this->assertEquals($pInputModelDB->getValue(), '1');
+		$this->assertEquals('checkbox', $pInputModelDB->getHtmlType());
+	}
 }
diff --git a/tests/TestClassFormModelBuilderSimilarEstateSettings.php b/tests/TestClassFormModelBuilderSimilarEstateSettings.php
index 2671cfc05..7d1fbc852 100644
--- a/tests/TestClassFormModelBuilderSimilarEstateSettings.php
+++ b/tests/TestClassFormModelBuilderSimilarEstateSettings.php
@@ -305,4 +305,26 @@ public function testCreateInputModelShowPriceOnRequest()
 		$pInputModelDB = $pInstance->createInputModelShowPriceOnRequest();
 		$this->assertEquals($pInputModelDB->getHtmlType(), InputModelOption::HTML_TYPE_CHECKBOX);
 	}
+
+	/**
+	 * @covers onOffice\WPlugin\Model\FormModelBuilder\FormModelBuilderSimilarEstateSettings::createInputModelPictureTypes
+	 */
+	public function testCreateInputModelPictureTypes()
+	{
+		$row = self::VALUES_BY_ROW;
+
+		$pWPOptionsWrapper = new WPOptionWrapperTest();
+		$pDataSimilarEstatesSettingsHandler = new DataSimilarEstatesSettingsHandler($pWPOptionsWrapper);
+		$this->_pDataSimilarView = $pDataSimilarEstatesSettingsHandler->createDataSimilarEstatesSettingsByValues($row);
+
+
+		$pInstance = $this->getMockBuilder(FormModelBuilderSimilarEstateSettings::class)
+			->disableOriginalConstructor()
+			->setMethods(['getValue'])
+			->getMock();
+		$pInstance->generate('test');
+
+		$pInputModelDB = $pInstance->createInputModelPictureTypes();
+		$this->assertEquals($pInputModelDB->getHtmlType(), 'checkbox');
+	}
 }
\ No newline at end of file
diff --git a/tests/TestClassFormPostContact.php b/tests/TestClassFormPostContact.php
index 91b5d29ef..59b2364a6 100644
--- a/tests/TestClassFormPostContact.php
+++ b/tests/TestClassFormPostContact.php
@@ -474,6 +474,24 @@ public function testFormHoneypotEmpty()
 		$pFormData = $this->_pFormPostContact->getFormDataInstance('contactForm', 2);
 		$this->assertEquals(FormPost::MESSAGE_SUCCESS, $pFormData->getStatus());
 	}
+
+	/**
+	 *
+	 */
+
+	public function testFormWhenHoneypotInactive()
+	{
+		update_option('onoffice-settings-honeypot', false);
+		$_POST = $this->getPostVariables();
+
+		$pDataFormConfiguration = $this->getNewDataFormConfiguration();
+		$pDataFormConfiguration->setCreateAddress(true);
+		$this->_pFormPostContact->initialCheck($pDataFormConfiguration, 2);
+
+		$pFormData = $this->_pFormPostContact->getFormDataInstance('contactForm', 2);
+		$this->assertEquals(FormPost::MESSAGE_SUCCESS, $pFormData->getStatus());
+	}
+
 	/**
 	 *
 	 * @return DataFormConfigurationContact
diff --git a/tests/TestClassFormPostInterest.php b/tests/TestClassFormPostInterest.php
index 70f1e8170..ecb6b8b5e 100644
--- a/tests/TestClassFormPostInterest.php
+++ b/tests/TestClassFormPostInterest.php
@@ -39,6 +39,7 @@
 use onOffice\WPlugin\Types\FieldsCollection;
 use onOffice\WPlugin\Types\FieldTypes;
 use onOffice\WPlugin\Utility\Logger;
+use onOffice\WPlugin\WP\WPQueryWrapper;
 use WP_UnitTestCase;
 use function DI\autowire;
 use function json_decode;
@@ -186,6 +187,10 @@ public function prepare()
 				$pFieldStpAnzahl->setLabel('Stp_anzahl');
 				$pFieldsCollection->addField($pFieldStpAnzahl);
 
+				$pFieldGDPRCheckBox = new Field('gdprcheckbox', onOfficeSDK::MODULE_ADDRESS);
+				$pFieldGDPRCheckBox->setType(FieldTypes::FIELD_TYPE_BOOLEAN);
+				$pFieldsCollection->addField($pFieldGDPRCheckBox);
+
 				return $this->_pFieldsCollectionBuilderShort;
 			}));
 
@@ -205,7 +210,8 @@ public function prepare()
 
 			$pFormAddressCreator = new Form\FormAddressCreator($this->_pSDKWrapperMocker, $this->_pFieldsCollectionBuilderShort);
 			$pSearchcriteriaFields = new SearchcriteriaFields($this->_pFieldsCollectionBuilderShort);
-			$pFormPostInterestConfiguration = new FormPostInterestConfigurationTest($this->_pSDKWrapperMocker, $pFormAddressCreator, $pSearchcriteriaFields);
+			$pWPQueryWrapper = new WPQueryWrapper();
+			$pFormPostInterestConfiguration = new FormPostInterestConfigurationTest($this->_pSDKWrapperMocker, $pFormAddressCreator, $pSearchcriteriaFields, $pWPQueryWrapper);
 
 		$this->_pContainer->set(FieldsCollectionBuilderShort::class, $this->_pFieldsCollectionBuilderShort);
 		$this->_pContainer->set(Form\FormPostConfiguration::class, autowire(FormPostConfigurationTest::class));
@@ -231,6 +237,7 @@ public function testInitialCheck()
 			'krit_bemerkung_oeffentlich' => 'comment3',
 			'stp_anzahl__von' => '20.00',
 			'stp_anzahl__bis' => '40.00',
+			'gdprcheckbox' => 'y'
 		];
 
 		$pConfig = $this->getNewDataFormConfigurationInterest();
@@ -324,6 +331,7 @@ private function getNewDataFormConfigurationInterest(): DataFormConfigurationInt
 		$pConfig->addInput('stp_anzahl', onOfficeSDK::MODULE_SEARCHCRITERIA);
 		$pConfig->addInput('message', '');
 		$pConfig->addInput('krit_bemerkung_oeffentlich', onOfficeSDK::MODULE_SEARCHCRITERIA);
+		$pConfig->addInput('gdprcheckbox', onOfficeSDK::MODULE_ADDRESS);
 		$pConfig->setFormName('interestform');
 		$pConfig->setRecipient('test@my-onoffice.com');
 		$pConfig->setRequiredFields(['Vorname', 'Name', 'vermarktungsart', 'stp_anzahl']);
@@ -349,6 +357,7 @@ private function addApiResponseCreateAddress(bool $success)
 			'Name' => 'Doe',
 			'email' => 'john@doemail.com',
 			'checkDuplicate' => false,
+			'DSGVOStatus' => "speicherungzugestimmt"
 		];
 
 		$response = [
@@ -450,7 +459,8 @@ private function addApiResponseSendMail(bool $success)
 			'addressdata' => [
 				'Vorname' => 'John',
 				'Name' => 'Doe',
-				'Email' => 'john@doemail.com'
+				'Email' => 'john@doemail.com',
+				'DSGVOStatus' => "speicherungzugestimmt"
 			],
 			'message' => "\nSuchkriterien des Interessenten:\nVermarktungsart: Kauf\nComment: comment3\nKaufpreis (min): 200000\nKaufpreis (max): 800000\nStp_anzahl (min): 20\nStp_anzahl (max): 40",
 			'subject' => 'Interest',
diff --git a/tests/TestClassFormPostInterestConfigurationDefault.php b/tests/TestClassFormPostInterestConfigurationDefault.php
index 54860d24b..65c0367cf 100644
--- a/tests/TestClassFormPostInterestConfigurationDefault.php
+++ b/tests/TestClassFormPostInterestConfigurationDefault.php
@@ -29,6 +29,7 @@
 use onOffice\WPlugin\Form\FormAddressCreator;
 use onOffice\WPlugin\Form\FormPostInterestConfigurationDefault;
 use onOffice\WPlugin\SDKWrapper;
+use onOffice\WPlugin\WP\WPQueryWrapper;
 use WP_UnitTestCase;
 
 /**
@@ -53,7 +54,9 @@ public function prepare()
 		$pFieldsCollectionBuilder = new FieldsCollectionBuilderShort(new Container());
 		$this->_pSubject = new FormPostInterestConfigurationDefault(new SDKWrapper(),
 			new FormAddressCreator(new SDKWrapper, $pFieldsCollectionBuilder),
-			new SearchcriteriaFields($pFieldsCollectionBuilder));
+			new SearchcriteriaFields($pFieldsCollectionBuilder),
+			new WPQueryWrapper()
+		);
 	}
 
 
@@ -85,4 +88,14 @@ public function testGetSearchcriteriaFields()
 	{
 		$this->assertInstanceOf(SearchcriteriaFields::class, $this->_pSubject->getSearchcriteriaFields());
 	}
+
+
+	/**
+	 *
+	 */
+
+	public function testGetWPQueryWrapper()
+	{
+		$this->assertInstanceOf(WPQueryWrapper::class, $this->_pSubject->getWPQueryWrapper());
+	}
 }
diff --git a/tests/TestClassFormPostOwner.php b/tests/TestClassFormPostOwner.php
index 9d7dcc289..71614df1f 100644
--- a/tests/TestClassFormPostOwner.php
+++ b/tests/TestClassFormPostOwner.php
@@ -137,6 +137,10 @@ public function prepare()
 				$pFieldKabelSatTv->setType(FieldTypes::FIELD_TYPE_BOOLEAN);
 				$pFieldsCollection->addField($pFieldKabelSatTv);
 
+				$pFieldGDPRCheckBox = new Field('gdprcheckbox', onOfficeSDK::MODULE_ADDRESS);
+				$pFieldGDPRCheckBox->setType(FieldTypes::FIELD_TYPE_BOOLEAN);
+				$pFieldsCollection->addField($pFieldGDPRCheckBox);
+
 				return $this->_pFieldsCollectionBuilderShort;
 			}));
 
@@ -214,6 +218,7 @@ public function testInitialCheckSuccess()
 			'wohnflaeche' => 800,
 			'kabel_sat_tv' => 'y',
 			'message' => 'Hello! I am interested in selling my property!',
+			'gdprcheckbox' => 'y'
 		];
 
 		$this->prepareMockerForAddressCreationSuccess();
@@ -358,6 +363,7 @@ private function prepareMockerForAddressCreationSuccess()
 			'ArtDaten' => ['Eigentümer'],
 			'phone' => '0815 234567890',
 			'checkDuplicate' => false,
+			'DSGVOStatus' => "speicherungzugestimmt"
 		];
 
 		$response = [
@@ -557,6 +563,7 @@ private function prepareMockerForContactSuccess()
 				'Name' => 'Doe',
 				'ArtDaten' => ['Eigentümer'],
 				'Telefon1' => '0815 234567890',
+				'DSGVOStatus' => "speicherungzugestimmt"
 			],
 			'estateid' => 5590,
 			'message' => 'Hello! I am interested in selling my property!',
@@ -620,6 +627,7 @@ private function getDataFormConfiguration()
 		$pDataFormConfiguration->addInput('kabel_sat_tv', onOfficeSDK::MODULE_ESTATE);
 		$pDataFormConfiguration->addInput('kabel_sat_tv', onOfficeSDK::MODULE_ESTATE);
 		$pDataFormConfiguration->addInput('message', '');
+		$pDataFormConfiguration->addInput('gdprcheckbox', onOfficeSDK::MODULE_ADDRESS);
 
 		$pDataFormConfiguration->setRequiredFields(['Vorname', 'Name', 'objektart']);
 
diff --git a/tests/TestClassFormPostOwnerConfigurationDefault.php b/tests/TestClassFormPostOwnerConfigurationDefault.php
index 749ea0bf5..70ec824bc 100644
--- a/tests/TestClassFormPostOwnerConfigurationDefault.php
+++ b/tests/TestClassFormPostOwnerConfigurationDefault.php
@@ -30,6 +30,7 @@
 use onOffice\WPlugin\Form\FormAddressCreator;
 use onOffice\WPlugin\Form\FormPostOwnerConfigurationDefault;
 use onOffice\WPlugin\SDKWrapper;
+use onOffice\WPlugin\WP\WPQueryWrapper;
 use WP_UnitTestCase;
 
 /**
@@ -53,7 +54,7 @@ public function prepare()
 	{
 		$this->_pSubject = new FormPostOwnerConfigurationDefault
 			(new SDKWrapper(), new FormAddressCreator(new SDKWrapper,
-				new FieldsCollectionBuilderShort(new Container())));
+				new FieldsCollectionBuilderShort(new Container())), new WPQueryWrapper());
 	}
 
 
@@ -97,4 +98,14 @@ public function testGetFormAddressCreator()
 	{
 		$this->assertInstanceOf(FormAddressCreator::class, $this->_pSubject->getFormAddressCreator());
 	}
+
+
+	/**
+	 *
+	 */
+
+	public function testGetWPQueryWrapper()
+	{
+		$this->assertInstanceOf(WPQueryWrapper::class, $this->_pSubject->getWPQueryWrapper());
+	}
 }
diff --git a/tests/TestClassRecordManagerReadListViewEstate.php b/tests/TestClassRecordManagerReadListViewEstate.php
index 9b19b1f28..2ea3ff5ae 100644
--- a/tests/TestClassRecordManagerReadListViewEstate.php
+++ b/tests/TestClassRecordManagerReadListViewEstate.php
@@ -24,6 +24,7 @@
 use Closure;
 use onOffice\WPlugin\Record\RecordManagerReadListViewEstate;
 use WP_UnitTestCase;
+use wpdb;
 
 /**
  *
@@ -76,4 +77,58 @@ public function testGetRecordsSortedAlphabetically()
 		$pFieldsFormSortAlphabe = $this->_pRecordManagerReadListViewEstate->getRecordsSortedAlphabetically();
 		$this->assertEquals([],$pFieldsFormSortAlphabe);
 	}
+
+	/**
+	 *
+	 */
+
+	public function testGetRecordsSortedAlphabeticallyByAttributes()
+	{
+		$_GET = [
+			'orderby' => 'name',
+			'order' => 'asc',
+			'search' => '77250'
+		];
+		$listViewConfigOutput = [
+			[
+				'listview_id' => '3',
+				'name' => 'listView-A',
+				'template' => 'oo-wp-plugin/templates.dist/estate/default.php',
+				'list_type' => 'Favorites List',
+			],
+			[
+				'listview_id' => '1',
+				'name' => 'listView-B',
+				'template' => 'oo-wp-plugin/templates.dist/estate/default.php',
+				'list_type' => 'Default',
+			],
+			[
+				'listview_id' => '2',
+				'name' => 'listView-C',
+				'template' => 'oo-wp-plugin/templates.dist/estate/default.php',
+				'list_type' => 'Default',
+			],
+		];
+
+		$pWPDB = $this->getMockBuilder(wpdb::class)
+				->disableOriginalConstructor(['testUser', 'testPassword', 'testDB', 'testHost'])
+				->setMethods(['get_results', 'get_var'])
+				->getMock();
+		$pWPDB->prefix = 'testPrefix';
+		$pWPDB->expects($this->once())
+				->method('get_results')
+				->willReturnOnConsecutiveCalls($listViewConfigOutput);
+		$pWPDB->expects($this->once())
+				->method('get_var')
+				->willReturnOnConsecutiveCalls(3);
+		$pRecordManagerReadListViewEstate = $this->getMockBuilder(RecordManagerReadListViewEstate::class)
+				->setMethods(['getWpdb'])
+				->getMock();
+
+		$pRecordManagerReadListViewEstate->method('getWpdb')->will($this->returnValue($pWPDB));
+		$pFieldsFormSortAlphabe = $pRecordManagerReadListViewEstate->getRecordsSortedAlphabetically();
+
+		$this->assertEquals(3, count($pFieldsFormSortAlphabe));
+		$this->assertEquals($listViewConfigOutput, $pFieldsFormSortAlphabe);
+	}
 }
diff --git a/tests/TestClassScriptLoaderGenericConfigurationDefault.php b/tests/TestClassScriptLoaderGenericConfigurationDefault.php
index 8ac16598a..a3305dcb1 100644
--- a/tests/TestClassScriptLoaderGenericConfigurationDefault.php
+++ b/tests/TestClassScriptLoaderGenericConfigurationDefault.php
@@ -28,7 +28,7 @@
 use onOffice\WPlugin\ScriptLoader\IncludeFileModel;
 use onOffice\WPlugin\ScriptLoader\ScriptLoaderGenericConfigurationDefault;
 use onOffice\WPlugin\Template;
-use onOffice\WPlugin\Template\TemplateCall;
+use RuntimeException;
 use WP_UnitTestCase;
 
 /**
@@ -99,4 +99,30 @@ public function testGetStyleUriByVersion()
 		$this->assertEquals($onofficeCssStyleVersion, 'onoffice_style');
 		$this->assertNotEmpty($onofficeCssStyleVersion);
 	}
+
+	/**
+	 *
+	 */
+	public function testGetStyleUriByVersionOnChildTheme()
+	{
+		$this->assertNotEmpty(get_stylesheet_directory());
+		$templatePath = get_stylesheet_directory().'/onoffice-theme/';
+		if (!is_dir($templatePath) &&
+			!mkdir($templatePath . '/templates/', 755, true) &&
+			!is_dir($templatePath . '/templates/'))
+		{
+			throw new RuntimeException(sprintf('Directory "%s" was not created', $templatePath . '/templates/'));
+		}
+		$styleFilePath = get_stylesheet_directory() . '/onoffice-theme/templates/onoffice-style.css';
+		if (!file_exists($styleFilePath)) {
+			file_put_contents(get_stylesheet_directory() . '/onoffice-theme/templates/onoffice-style.css', 'onoffice-style.css');
+		}
+		$pScriptLoaderGenericConfigurationDefault = new ScriptLoaderGenericConfigurationDefault();
+		$onofficeCssStyleVersion = $pScriptLoaderGenericConfigurationDefault->getOnOfficeStyleVersion();
+		$onofficeCssStyleFilePath = $pScriptLoaderGenericConfigurationDefault->getStyleUriByVersion($onofficeCssStyleVersion);
+
+		$this->assertEquals($onofficeCssStyleVersion, 'onoffice_style');
+		$this->assertEquals($onofficeCssStyleFilePath, get_stylesheet_directory_uri() . '/onoffice-theme/templates/onoffice-style.css');
+		unlink(get_stylesheet_directory() . '/onoffice-theme/templates/onoffice-style.css');
+	}
 }
diff --git a/tests/resources/ApiResponseReadEstatesPublishedENGRaw.json b/tests/resources/ApiResponseReadEstatesPublishedENGRaw.json
index a8c058b86..225e13a8d 100644
--- a/tests/resources/ApiResponseReadEstatesPublishedENGRaw.json
+++ b/tests/resources/ApiResponseReadEstatesPublishedENGRaw.json
@@ -12,7 +12,8 @@
 			"preisreduktion",
 			"courtage_frei",
 			"objekt_des_tages",
-			"vermarktungsart"
+			"vermarktungsart",
+			"preisAufAnfrage"
 		],
 		"filter": {
 			"veroeffentlichen": [
@@ -83,6 +84,7 @@
 						"objektnr_extern": "DJ636",
 						"plz": "",
 						"land": "DEU",
+						"preisAufAnfrage": "1",
 						"mainLangId": null
 					}
 				},
@@ -119,6 +121,7 @@
 						"objektnr_extern": "UT591",
 						"plz": "52068",
 						"land": "DEU",
+						"preisAufAnfrage": "0",
 						"mainLangId": null
 					}
 				},
@@ -155,6 +158,7 @@
 						"objektnr_extern": "GH203",
 						"plz": "25992",
 						"land": "DEU",
+						"preisAufAnfrage": "1",
 						"mainLangId": null
 					}
 				},
@@ -191,6 +195,7 @@
 						"objektnr_extern": "JJ142",
 						"plz": "52076",
 						"land": "DEU",
+						"preisAufAnfrage": "1",
 						"mainLangId": null
 					}
 				},
@@ -227,6 +232,7 @@
 						"objektnr_extern": "JJ108",
 						"plz": "",
 						"land": "",
+						"preisAufAnfrage": "0",
 						"mainLangId": "1071"
 					}
 				}