diff --git a/core/modules/action/action.info b/core/modules/action/action.info
index ddddd63..921577f 100644
--- a/core/modules/action/action.info
+++ b/core/modules/action/action.info
@@ -4,3 +4,6 @@ package = Core
 version = VERSION
 core = 8.x
 configure = admin/config/system/actions
+tags[] = action
+tags[] = api
+tags[] = views/field
diff --git a/core/modules/aggregator/aggregator.info b/core/modules/aggregator/aggregator.info
index 5954a87..214221c 100644
--- a/core/modules/aggregator/aggregator.info
+++ b/core/modules/aggregator/aggregator.info
@@ -6,3 +6,5 @@ core = 8.x
 configure = admin/config/services/aggregator/settings
 stylesheets[all][] = aggregator.theme.css
 dependencies[] = file
+tags[] = block
+tags[] = service
diff --git a/core/modules/ban/ban.info b/core/modules/ban/ban.info
index e23331c..c297f20 100644
--- a/core/modules/ban/ban.info
+++ b/core/modules/ban/ban.info
@@ -4,3 +4,4 @@ package = Core
 version = VERSION
 core = 8.x
 configure = admin/config/people/ban
+tags[] = spam
diff --git a/core/modules/block/block.info b/core/modules/block/block.info
index e22e797..a10f9fe 100644
--- a/core/modules/block/block.info
+++ b/core/modules/block/block.info
@@ -4,3 +4,6 @@ package = Core
 version = VERSION
 core = 8.x
 configure = admin/structure/block
+tags[] = api
+tags[] = block
+tags[] = layout
diff --git a/core/modules/book/book.info b/core/modules/book/book.info
index 1f2be6f..72ec738 100644
--- a/core/modules/book/book.info
+++ b/core/modules/book/book.info
@@ -6,3 +6,6 @@ core = 8.x
 dependencies[] = node
 configure = admin/content/book/settings
 stylesheets[all][] = book.theme.css
+tags[] = block
+tags[] = content
+tags[] = structure
diff --git a/core/modules/breakpoint/breakpoint.info b/core/modules/breakpoint/breakpoint.info
index 793bdcd..8d9c25f 100644
--- a/core/modules/breakpoint/breakpoint.info
+++ b/core/modules/breakpoint/breakpoint.info
@@ -3,4 +3,4 @@ description = Manage breakpoints and breakpoint groups for responsive designs.
 package = Core
 version = VERSION
 core = 8.x
-
+tags[] = theme
diff --git a/core/modules/color/color.info b/core/modules/color/color.info
index 6d2c9f9..960ca0f 100644
--- a/core/modules/color/color.info
+++ b/core/modules/color/color.info
@@ -3,3 +3,4 @@ description = Allows administrators to change the color scheme of compatible the
 package = Core
 version = VERSION
 core = 8.x
+tags[] = theme
diff --git a/core/modules/comment/comment.info b/core/modules/comment/comment.info
index 27a424a..547da73 100644
--- a/core/modules/comment/comment.info
+++ b/core/modules/comment/comment.info
@@ -7,4 +7,6 @@ dependencies[] = node
 dependencies[] = text
 configure = admin/content/comment
 stylesheets[all][] = comment.theme.css
+tags[] = block
 tags[] = entity
+tags[] = content
diff --git a/core/modules/config/config.info b/core/modules/config/config.info
index efab7a1..9a82cc3 100644
--- a/core/modules/config/config.info
+++ b/core/modules/config/config.info
@@ -4,3 +4,4 @@ package = Core
 version = VERSION
 core = 8.x
 configure = admin/config/development/sync
+tags[] = api/ui
diff --git a/core/modules/contact/contact.info b/core/modules/contact/contact.info
index eff6d33..7e661a5 100644
--- a/core/modules/contact/contact.info
+++ b/core/modules/contact/contact.info
@@ -4,3 +4,5 @@ package = Core
 version = VERSION
 core = 8.x
 configure = admin/structure/contact
+tags[] = entity
+tags[] = mail
diff --git a/core/modules/contextual/contextual.info b/core/modules/contextual/contextual.info
index 8a99dea..d0a26f1 100644
--- a/core/modules/contextual/contextual.info
+++ b/core/modules/contextual/contextual.info
@@ -3,3 +3,4 @@ description = Provides contextual links to perform actions related to elements o
 package = Core
 version = VERSION
 core = 8.x
+tags[] = ux
diff --git a/core/modules/dblog/dblog.info b/core/modules/dblog/dblog.info
index fd18bb3..d84d0de 100644
--- a/core/modules/dblog/dblog.info
+++ b/core/modules/dblog/dblog.info
@@ -3,3 +3,4 @@ description = Logs and records system events to the database.
 package = Core
 version = VERSION
 core = 8.x
+tags[] = admin
diff --git a/core/modules/entity/entity.info b/core/modules/entity/entity.info
index 5887b39..a7a92e5 100644
--- a/core/modules/entity/entity.info
+++ b/core/modules/entity/entity.info
@@ -4,3 +4,4 @@ package = Core
 version = VERSION
 core = 8.x
 required = TRUE
+tags[] = api
diff --git a/core/modules/field/field.info b/core/modules/field/field.info
index f8e5d92..382c341 100644
--- a/core/modules/field/field.info
+++ b/core/modules/field/field.info
@@ -6,4 +6,5 @@ core = 8.x
 dependencies[] = field_sql_storage
 required = TRUE
 stylesheets[all][] = theme/field.css
+tags[] = api
 tags[] = field
diff --git a/core/modules/field_ui/field_ui.info b/core/modules/field_ui/field_ui.info
index c35c4e0..cc41bdc 100644
--- a/core/modules/field_ui/field_ui.info
+++ b/core/modules/field_ui/field_ui.info
@@ -4,5 +4,6 @@ package = Core
 version = VERSION
 core = 8.x
 dependencies[] = field
+tags[] = api/ui
+tags[] = entity
 tags[] = field
-tags[] = ui
diff --git a/core/modules/file/file.info b/core/modules/file/file.info
index 7268517..2058ea8 100644
--- a/core/modules/file/file.info
+++ b/core/modules/file/file.info
@@ -6,3 +6,4 @@ core = 8.x
 dependencies[] = field
 tags[] = entity
 tags[] = field/type
+tags[] = media
diff --git a/core/modules/filter/filter.info b/core/modules/filter/filter.info
index 03ed179..bc83718 100644
--- a/core/modules/filter/filter.info
+++ b/core/modules/filter/filter.info
@@ -5,3 +5,5 @@ version = VERSION
 core = 8.x
 required = TRUE
 configure = admin/config/content/formats
+tags[] = api
+tags[] = filter
diff --git a/core/modules/forum/forum.info b/core/modules/forum/forum.info
index c348a2a..f21a414 100644
--- a/core/modules/forum/forum.info
+++ b/core/modules/forum/forum.info
@@ -9,3 +9,5 @@ version = VERSION
 core = 8.x
 configure = admin/structure/forum
 stylesheets[all][] = forum.css
+tags[] = block
+tags[] = content
diff --git a/core/modules/help/help.info b/core/modules/help/help.info
index 615a302..c4c1e32 100644
--- a/core/modules/help/help.info
+++ b/core/modules/help/help.info
@@ -3,3 +3,5 @@ description = Manages the display of online help.
 package = Core
 version = VERSION
 core = 8.x
+tags[] = api
+tags[] = block
diff --git a/core/modules/history/history.info b/core/modules/history/history.info
index 7658749..e20b7e1 100644
--- a/core/modules/history/history.info
+++ b/core/modules/history/history.info
@@ -4,3 +4,4 @@ package = Core
 version = VERSION
 core = 8.x
 dependencies[] = node
+tags[] = content
diff --git a/core/modules/image/image.info b/core/modules/image/image.info
index b8f1ad1..16c0878 100644
--- a/core/modules/image/image.info
+++ b/core/modules/image/image.info
@@ -6,3 +6,4 @@ core = 8.x
 dependencies[] = file
 configure = admin/config/media/image-styles
 tags[] = field/type
+tags[] = media
diff --git a/core/modules/jsonld/jsonld.info b/core/modules/jsonld/jsonld.info
index 70d5d40..ae414ad 100644
--- a/core/modules/jsonld/jsonld.info
+++ b/core/modules/jsonld/jsonld.info
@@ -2,3 +2,4 @@ name = JSON-LD
 description = Serializes entities using JSON-LD format.
 package = Core
 core = 8.x
+tags[] = service
diff --git a/core/modules/language/language.info b/core/modules/language/language.info
index 378e19e..4407f17 100644
--- a/core/modules/language/language.info
+++ b/core/modules/language/language.info
@@ -4,4 +4,5 @@ package = Core
 version = VERSION
 core = 8.x
 configure = admin/config/regional/language
+tags[] = block
 tags[] = language
diff --git a/core/modules/layout/layout.info b/core/modules/layout/layout.info
index 187bfea..1db674a 100644
--- a/core/modules/layout/layout.info
+++ b/core/modules/layout/layout.info
@@ -3,3 +3,4 @@ description = Makes it possible to swap different page layouts.
 package = Core
 version = VERSION
 core = 8.x
+tags[] = layout
diff --git a/core/modules/menu/menu.info b/core/modules/menu/menu.info
index e5e2c8b..3eda95b 100644
--- a/core/modules/menu/menu.info
+++ b/core/modules/menu/menu.info
@@ -4,3 +4,6 @@ package = Core
 version = VERSION
 core = 8.x
 configure = admin/structure/menu
+tags[] = block
+tags[] = content
+tags[] = structure
diff --git a/core/modules/node/node.info b/core/modules/node/node.info
index 5ac040e..574f475 100644
--- a/core/modules/node/node.info
+++ b/core/modules/node/node.info
@@ -4,4 +4,7 @@ package = Core
 version = VERSION
 core = 8.x
 configure = admin/structure/types
+tags[] = api
+tags[] = block
 tags[] = entity
+tags[] = content
diff --git a/core/modules/openid/openid.info b/core/modules/openid/openid.info
index fd7359a..f296d6f 100644
--- a/core/modules/openid/openid.info
+++ b/core/modules/openid/openid.info
@@ -3,3 +3,4 @@ description = "Allows users to log into your site using OpenID."
 version = VERSION
 package = Core
 core = 8.x
+tags[] = service
diff --git a/core/modules/options/options.info b/core/modules/options/options.info
index 660af1f..a05168c 100644
--- a/core/modules/options/options.info
+++ b/core/modules/options/options.info
@@ -5,3 +5,5 @@ version = VERSION
 core = 8.x
 dependencies[] = field
 tags[] = field/type
+; Ex Options widgets...?
+tags[] = field/widget
diff --git a/core/modules/overlay/overlay.info b/core/modules/overlay/overlay.info
index a782792..34c2d64 100644
--- a/core/modules/overlay/overlay.info
+++ b/core/modules/overlay/overlay.info
@@ -3,3 +3,4 @@ description = Displays the Drupal administration interface in an overlay.
 package = Core
 version = VERSION
 core = 8.x
+tags[] = ux
diff --git a/core/modules/path/path.info b/core/modules/path/path.info
index 7323d1b..ffb0af0 100644
--- a/core/modules/path/path.info
+++ b/core/modules/path/path.info
@@ -4,3 +4,4 @@ package = Core
 version = VERSION
 core = 8.x
 configure = admin/config/search/path
+tags[] = content
diff --git a/core/modules/php/php.info b/core/modules/php/php.info
index f155609..d8c2254 100644
--- a/core/modules/php/php.info
+++ b/core/modules/php/php.info
@@ -3,3 +3,4 @@ description = Allows embedded PHP code/snippets to be evaluated.
 package = Core
 version = VERSION
 core = 8.x
+tags[] = filter
diff --git a/core/modules/picture/picture.info b/core/modules/picture/picture.info
index 47649d5..de8ad00 100644
--- a/core/modules/picture/picture.info
+++ b/core/modules/picture/picture.info
@@ -6,3 +6,5 @@ core = 8.x
 dependencies[] = breakpoint
 dependencies[] = image
 configure = admin/config/media/picturemapping
+tags[] = field/formatter
+tags[] = theme
diff --git a/core/modules/poll/poll.info b/core/modules/poll/poll.info
index 7cd674a..adb37c5 100644
--- a/core/modules/poll/poll.info
+++ b/core/modules/poll/poll.info
@@ -6,3 +6,5 @@ core = 8.x
 dependencies[] = node
 stylesheets[all][] = poll.base.css
 stylesheets[all][] = poll.theme.css
+tags[] = block
+tags[] = content
diff --git a/core/modules/rdf/rdf.info b/core/modules/rdf/rdf.info
index bc975de..ec485b4 100644
--- a/core/modules/rdf/rdf.info
+++ b/core/modules/rdf/rdf.info
@@ -3,3 +3,4 @@ description = Enriches your content with metadata to let other applications (e.g
 package = Core
 version = VERSION
 core = 8.x
+tags[] = service
diff --git a/core/modules/rest/rest.info b/core/modules/rest/rest.info
index c0bf4bd..2b9e55a 100644
--- a/core/modules/rest/rest.info
+++ b/core/modules/rest/rest.info
@@ -6,3 +6,4 @@ core = 8.x
 ; @todo Remove this dependency once hard coding to JSON-LD is gone.
 dependencies[] = jsonld
 configure = admin/config/services/rest
+tags[] = service
diff --git a/core/modules/search/search.info b/core/modules/search/search.info
index 8fdbfaa..4bc76f4 100644
--- a/core/modules/search/search.info
+++ b/core/modules/search/search.info
@@ -5,3 +5,5 @@ version = VERSION
 core = 8.x
 configure = admin/config/search/settings
 stylesheets[all][] = search.theme.css
+tags[] = block
+tags[] = content
diff --git a/core/modules/shortcut/shortcut.info b/core/modules/shortcut/shortcut.info
index 5ed5f2d..eb08eae 100644
--- a/core/modules/shortcut/shortcut.info
+++ b/core/modules/shortcut/shortcut.info
@@ -4,3 +4,5 @@ package = Core
 version = VERSION
 core = 8.x
 configure = admin/config/user-interface/shortcut
+tags[] = admin
+tags[] = ux
diff --git a/core/modules/simpletest/simpletest.info b/core/modules/simpletest/simpletest.info
index 6e18c42..94c81b6 100644
--- a/core/modules/simpletest/simpletest.info
+++ b/core/modules/simpletest/simpletest.info
@@ -4,4 +4,4 @@ package = Core
 version = VERSION
 core = 8.x
 configure = admin/config/development/testing/settings
-
+tags[] = dev
diff --git a/core/modules/statistics/statistics.info b/core/modules/statistics/statistics.info
index 4b18b8a..fbc5ecc 100644
--- a/core/modules/statistics/statistics.info
+++ b/core/modules/statistics/statistics.info
@@ -4,3 +4,4 @@ package = Core
 version = VERSION
 core = 8.x
 configure = admin/config/system/statistics
+tags[] = admin
diff --git a/core/modules/syslog/syslog.info b/core/modules/syslog/syslog.info
index e3f541f..e29f844 100644
--- a/core/modules/syslog/syslog.info
+++ b/core/modules/syslog/syslog.info
@@ -3,3 +3,4 @@ description = Logs and records system events to syslog.
 package = Core
 version = VERSION
 core = 8.x
+tags[] = admin
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 36e64d5..5e25eef 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -812,6 +812,7 @@ function system_modules($form, $form_state = array()) {
   $form['filters']['tag'] = array(
     '#type' => 'select',
     '#title' => t('Filter by tag'),
+    '#empty_option' => t('- Select -'),
     '#options' => array(),
     '#id' => 'system-filter-tag',
   );
@@ -843,6 +844,7 @@ function system_modules($form, $form_state = array()) {
     }
   }
   // Populate the filter select options.
+  ksort($all_tags);
   $form['filters']['tag']['#options'] = drupal_map_assoc(array_keys($all_tags));
 
   $modules = array();
diff --git a/core/modules/system/system.info b/core/modules/system/system.info
index 195ca07..3302cd2 100644
--- a/core/modules/system/system.info
+++ b/core/modules/system/system.info
@@ -5,3 +5,5 @@ version = VERSION
 core = 8.x
 required = TRUE
 configure = admin/config/system
+tags[] = admin
+tags[] = api
diff --git a/core/modules/toolbar/toolbar.info b/core/modules/toolbar/toolbar.info
index a6fd841..c709add 100644
--- a/core/modules/toolbar/toolbar.info
+++ b/core/modules/toolbar/toolbar.info
@@ -3,7 +3,7 @@ description = Provides a toolbar that shows the top-level administration menu it
 core = 8.x
 package = Core
 version = VERSION
-
 dependencies[] = breakpoint
-
 configure = admin/structure/toolbar
+tags[] = admin
+tags[] = ux
diff --git a/core/modules/tracker/tracker.info b/core/modules/tracker/tracker.info
index b39eb3f..a85ee1e 100644
--- a/core/modules/tracker/tracker.info
+++ b/core/modules/tracker/tracker.info
@@ -4,3 +4,4 @@ dependencies[] = comment
 package = Core
 version = VERSION
 core = 8.x
+tags[] = content
diff --git a/core/modules/translation_entity/translation_entity.info b/core/modules/translation_entity/translation_entity.info
index cd92c7b..45f5674 100644
--- a/core/modules/translation_entity/translation_entity.info
+++ b/core/modules/translation_entity/translation_entity.info
@@ -4,4 +4,7 @@ dependencies[] = language
 package = Core
 version = VERSION
 core = 8.x
+tags[] = content
+tags[] = entity
+tags[] = field
 tags[] = language
diff --git a/core/modules/update/update.info b/core/modules/update/update.info
index 17e8d7a..8bcda76 100644
--- a/core/modules/update/update.info
+++ b/core/modules/update/update.info
@@ -5,3 +5,4 @@ package = Core
 core = 8.x
 configure = admin/reports/updates/settings
 dependencies[] = file
+tags[] = admin
diff --git a/core/modules/user/user.info b/core/modules/user/user.info
index 91a11bc..780ec16 100644
--- a/core/modules/user/user.info
+++ b/core/modules/user/user.info
@@ -6,4 +6,5 @@ core = 8.x
 required = TRUE
 configure = admin/config/people
 stylesheets[all][] = user.css
+tags[] = block
 tags[] = entity
diff --git a/core/modules/views/views.info b/core/modules/views/views.info
index edd7390..bf5c280 100644
--- a/core/modules/views/views.info
+++ b/core/modules/views/views.info
@@ -3,3 +3,7 @@ description = Create customized lists and queries from your database.
 package = Core
 version = VERSION
 core = 8.x
+tags[] = api
+tags[] = block
+tags[] = content
+tags[] = views
diff --git a/core/modules/views/views_ui/views_ui.info b/core/modules/views/views_ui/views_ui.info
index 82c8ab3..35df28f 100644
--- a/core/modules/views/views_ui/views_ui.info
+++ b/core/modules/views/views_ui/views_ui.info
@@ -5,3 +5,4 @@ version = VERSION
 core = 8.x
 configure = admin/structure/views
 dependencies[] = views
+tags[] = api/ui
diff --git a/core/modules/xmlrpc/xmlrpc.info b/core/modules/xmlrpc/xmlrpc.info
index 6e5f676..8d8cb9b 100644
--- a/core/modules/xmlrpc/xmlrpc.info
+++ b/core/modules/xmlrpc/xmlrpc.info
@@ -3,3 +3,4 @@ description = Provides XML-RPC functionality.
 package = Core
 version = VERSION
 core = 8.x
+tags[] = service