diff --git a/typo3/sysext/css_styled_content/static/setup.txt b/typo3/sysext/css_styled_content/static/setup.txt
index ec5db76..7d27605 100644
--- a/typo3/sysext/css_styled_content/static/setup.txt
+++ b/typo3/sysext/css_styled_content/static/setup.txt
@@ -1900,7 +1900,6 @@ tt_content.menu {
 			1 = TMENU
 			1 {
 				sectionIndex = 1
-				sectionIndex.type = header
 				NO.wrapItemAndSub = <li class="csc-section">|</li>
 			}
 		}
@@ -1964,7 +1963,6 @@ tt_content.menu {
 			2 < .1
 			2 {
 				sectionIndex = 1
-				sectionIndex.type = header
 				wrap = <ul>|</ul>
 				NO.wrapItemAndSub = <li class="csc-section">|</li>
 			}
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
index 9f1df20..99e2773 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
@@ -1831,6 +1831,9 @@ class AbstractMenuContentObject {
 			return array();
 		}
 		$configuration = $this->mconf['sectionIndex.'];
+		if ($basePageRow['nav_hide'] && !$configuration['includeHiddenPages']) {
+			return array();
+		}
 		$useColPos = 0;
 		if (trim($configuration['useColPos']) !== '' || is_array($configuration['useColPos.'])) {
 			$useColPos = $GLOBALS['TSFE']->cObj->stdWrap($configuration['useColPos'], $configuration['useColPos.']);
@@ -1853,13 +1856,11 @@ class AbstractMenuContentObject {
 			if ($GLOBALS['TSFE']->sys_language_contentOL && $basePageRow['_PAGES_OVERLAY_LANGUAGE']) {
 				$row = $this->sys_page->getRecordOverlay('tt_content', $row, $basePageRow['_PAGES_OVERLAY_LANGUAGE'], $GLOBALS['TSFE']->sys_language_contentOL);
 			}
-			if ($this->mconf['sectionIndex.']['type'] !== 'all') {
-				$doIncludeInSectionIndex = $row['sectionIndex'] >= 1;
-				$doHeaderCheck = $this->mconf['sectionIndex.']['type'] === 'header';
-				$isValidHeader = ((int)$row['header_layout'] !== 100 || !empty($this->mconf['sectionIndex.']['includeHiddenHeaders'])) && trim($row['header']) !== '';
-				if (!$doIncludeInSectionIndex || $doHeaderCheck && !$isValidHeader) {
-					continue;
-				}
+			if (!$configuration['includeHiddenHeaders'] && (int)$row['header_layout'] !== 100) {
+				continue;
+			}
+			if (!$configuration['includeEmptyHeaders'] && trim($row['header']) === '') {
+				continue;
 			}
 			if (is_array($row)) {
 				$uid = $row['uid'];
@@ -1875,6 +1876,7 @@ class AbstractMenuContentObject {
 				$result[$uid]['bodytext'] = $row['bodytext'];
 				$result[$uid]['image'] = $row['image'];
 				$result[$uid]['sectionIndex_uid'] = $uid;
+				$result[$uid]['nav_hide'] = $row['sectionIndex'] == 0;
 			}
 		}
 		$GLOBALS['TYPO3_DB']->sql_free_result($resource);