diff --git a/Classes/Service/BackendService.php b/Classes/Service/BackendService.php
index d6cd1df5b4b939c2f05fde42206aec920b0025ae..08e9d7ef5f2a14564a9b7fe2449c6f7f24f00310 100644
--- a/Classes/Service/BackendService.php
+++ b/Classes/Service/BackendService.php
@@ -158,7 +158,6 @@ class BackendService {
 			->setSetVariables([]);
 
 		$buttonBar->addButton($shortcutButton, ButtonBar::BUTTON_POSITION_RIGHT);
-		$docHeaderComponent->getButtonBar();
 	}
 
 	/**
diff --git a/Classes/ViewHelpers/Be/Menus/ActionMenuItemViewHelper.php b/Classes/ViewHelpers/Be/Menus/ActionMenuItemViewHelper.php
index f919e1420034a537e51e37e5fda3a03a043c7d7e..005dccc9c49a4f745426f6ea96a336eb44fc23cb 100644
--- a/Classes/ViewHelpers/Be/Menus/ActionMenuItemViewHelper.php
+++ b/Classes/ViewHelpers/Be/Menus/ActionMenuItemViewHelper.php
@@ -87,20 +87,12 @@ class ActionMenuItemViewHelper extends AbstractTagBasedViewHelper {
 		);
 		if (
 			$this->arguments['selected'] ||
-			array_diff($requestArguments, $viewHelperArguments) === [] ||
-			$this->tag->hasAttribute('selected')
+			array_diff($requestArguments, $viewHelperArguments) === []
 		) {
 			$this->tag->addAttribute('selected', 'selected');
 		} else {
 			$this->tag->removeAttribute('selected');
 		}
-
-		if ($arguments['parameters']['selected'] === 'selected') {
-			$this->tag->addAttribute('selected', 'selected');
-		} elseif ($arguments['parameters']['selected'] === '') {
-			$this->tag->removeAttribute('selected');
-		}
-
 		$this->tag->setContent($label);
 
 		return $this->tag->render();
diff --git a/Classes/ViewHelpers/Widget/UriViewHelper.php b/Classes/ViewHelpers/Widget/UriViewHelper.php
index 8d868712bc9e27046eaf36b9813d89c049a4c91e..3e3e6ecfec93c7fbeece9bfe45af6a3b834f7e04 100644
--- a/Classes/ViewHelpers/Widget/UriViewHelper.php
+++ b/Classes/ViewHelpers/Widget/UriViewHelper.php
@@ -116,10 +116,16 @@ class UriViewHelper extends AbstractViewHelper {
 		$argumentPrefix = $controllerContext->getRequest()->getArgumentPrefix();
 		$parentNamespace = $controllerContext->getRequest()->getWidgetContext()->getParentPluginNamespace();
 		$parentArguments = GeneralUtility::_GP($parentNamespace);
-		$allArguments = [$argumentPrefix => $arguments];
+		$allArguments = [$argumentPrefix => $arguments['arguments'] ?? []];
 		if ($parentArguments && isset($parentArguments['filters'])) {
 			$allArguments[$parentNamespace . '[filters]'] = $parentArguments['filters'];
 		}
+		if ($arguments['action'] ?? FALSE) {
+			$allArguments[$argumentPrefix]['action'] = $arguments['action'];
+		}
+		if (($arguments['format'] ?? '') !== '') {
+			$allArguments[$argumentPrefix]['format'] = $arguments['format'];
+		}
 		return $uriBuilder->reset()
 			->setArguments($allArguments)
 			->setSection($arguments['section'])