diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index 371b00755..feb0b039a 100644
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@@ -78,7 +78,7 @@ form:
 
                 pages.order.by:
                     type: select
-                    size: medium
+                    size: long
                     classes: fancy
                     label: PLUGIN_ADMIN.DEFAULT_ORDERING
                     help: PLUGIN_ADMIN.DEFAULT_ORDERING_HELP
diff --git a/system/blueprints/pages/default.yaml b/system/blueprints/pages/default.yaml
index 8af41e08f..04ee6e753 100644
--- a/system/blueprints/pages/default.yaml
+++ b/system/blueprints/pages/default.yaml
@@ -23,6 +23,7 @@ form:
           fields:
             header.title:
               type: text
+              autofocus: true
               style: vertical
               label: PLUGIN_ADMIN.TITLE
 
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 9c3f60fcf..5f88af978 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -1843,7 +1843,7 @@ class Page
                     }
                     foreach ($items as $item) {
                         if (empty($page->taxonomy[$taxonomy])
-                            || !in_array($item, $page->taxonomy[$taxonomy])) {
+                            || !in_array(htmlspecialchars_decode($item, ENT_QUOTES), $page->taxonomy[$taxonomy])) {
                             $collection->remove();
                         }
                     }
diff --git a/system/src/Grav/Console/Cli/ComposerCommand.php b/system/src/Grav/Console/Cli/ComposerCommand.php
index d123b96f4..843df5c76 100644
--- a/system/src/Grav/Console/Cli/ComposerCommand.php
+++ b/system/src/Grav/Console/Cli/ComposerCommand.php
@@ -54,8 +54,8 @@ class ComposerCommand extends Command
                 InputOption::VALUE_NONE,
                 'update the dependencies'
             )
-            ->setDescription("Updates the composer vendordependencies needed by Grav.")
-            ->setHelp('The <info>composer</info> command updates the composer vendordependencies needed by Grav');
+            ->setDescription("Updates the composer vendor dependencies needed by Grav.")
+            ->setHelp('The <info>composer</info> command updates the composer vendor dependencies needed by Grav');
     }
 
     /**