diff --git a/composer.json b/composer.json
old mode 100755
new mode 100644
index cc9b24b..3713e79
--- a/composer.json
+++ b/composer.json
@@ -23,8 +23,11 @@
         "islandora/controlled_access_terms": "*",
         "drupal/field_permissions": "*",
 	"drupal/entity_reference_revisions": "^1.6",
+	"drupal/media_attribution": "*",
 	"drupal/name": "1.x-dev",
-        "drupal/paragraphs": "~1.5"
+        "drupal/paragraphs": "~1.5",
+        "drupal/facets": "*",
+        "drupal/vefl": "*"
     }
 }
 
diff --git a/config/optional/views.view.rdm_manage_media.yml b/config/optional/views.view.rdm_manage_media.yml
deleted file mode 100644
index b55b709..0000000
--- a/config/optional/views.view.rdm_manage_media.yml
+++ /dev/null
@@ -1,1289 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_use
-    - field.storage.media.field_mime_type
-  enforced:
-    module:
-      - islandora_core_feature
-  module:
-    - islandora_riprap
-    - jsonld
-    - media
-    - rest
-    - serialization
-    - user
-_core:
-  default_config_hash: ulZTEi1E-dZLYvDO8Dz2WPOTVb-e3D4Qsl89px1PaSk
-id: rdm_manage_media
-label: 'RDM Manage media'
-module: views
-description: 'Manage media belonging to a piece of content'
-tag: ''
-base_table: media_field_data
-base_field: mid
-core: 8.x
-display:
-  default:
-    display_plugin: default
-    id: default
-    display_title: Master
-    position: 0
-    display_options:
-      access:
-        type: perm
-        options:
-          perm: 'manage media'
-      cache:
-        type: none
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: mini
-        options:
-          items_per_page: 10
-          offset: 0
-          id: 0
-          total_pages: null
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          tags:
-            previous: ‹‹
-            next: ››
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            media_bulk_form: media_bulk_form
-            name: name
-            bundle: bundle
-            field_media_model: field_media_model
-            field_mime_type: field_mime_type
-            changed: changed
-            operations: operations
-          info:
-            media_bulk_form:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            bundle:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_media_model:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_mime_type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            operations:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: field_media_model
-          empty_table: false
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      fields:
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: false
-            ellipsis: false
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: media
-          entity_field: media
-          plugin_id: field
-        bundle:
-          id: bundle
-          table: media_field_data
-          field: bundle
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Media type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: media
-          entity_field: bundle
-          plugin_id: field
-        field_mime_type:
-          id: field_mime_type
-          table: media__field_mime_type
-          field: field_mime_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'MIME type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          plugin_id: field
-        changed:
-          id: changed
-          table: media_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Changed
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: media
-          entity_field: changed
-          plugin_id: field
-        media_bulk_form:
-          id: media_bulk_form
-          table: media
-          field: media_bulk_form
-          entity_type: media
-          plugin_id: bulk_form
-        operations:
-          id: operations
-          table: media
-          field: operations
-          entity_type: media
-          plugin_id: entity_operations
-      filters: {  }
-      sorts: {  }
-      title: 'Manage Media'
-      header: {  }
-      footer: {  }
-      empty: {  }
-      relationships: {  }
-      arguments:
-        field_media_of_target_id:
-          id: field_media_of_target_id
-          table: media__field_media_of
-          field: field_media_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            items_per_page: 25
-            override: false
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: true
-          validate:
-            type: 'entity:node'
-            fail: 'not found'
-          validate_options:
-            operation: view
-            multiple: 0
-            bundles: {  }
-            access: false
-          break_phrase: false
-          not: false
-          plugin_id: numeric
-      display_extenders: {  }
-      filter_groups:
-        operator: AND
-        groups: {  }
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_mime_type'
-        - extensions
-  page_1:
-    display_plugin: page
-    id: page_1
-    display_title: Page
-    position: 1
-    display_options:
-      display_extenders:
-        doc_serialization: {  }
-      path: node/%node/media
-      menu:
-        type: tab
-        title: Media
-        description: 'Lists all media belonging to this content'
-        expanded: false
-        parent: ''
-        weight: 0
-        context: '0'
-        menu_name: main
-      fields:
-        media_bulk_form:
-          id: media_bulk_form
-          table: media
-          field: media_bulk_form
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          action_title: Action
-          include_exclude: exclude
-          selected_actions: {  }
-          entity_type: media
-          plugin_id: bulk_form
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: false
-            ellipsis: false
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: media
-          entity_field: media
-          plugin_id: field
-        bundle:
-          id: bundle
-          table: media_field_data
-          field: bundle
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Media type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: media
-          entity_field: bundle
-          plugin_id: field
-        field_mime_type:
-          id: field_mime_type
-          table: media__field_mime_type
-          field: field_mime_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'MIME type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          plugin_id: field
-        field_media_use:
-          id: field_media_use
-          table: media__field_media_use
-          field: field_media_use
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Media Use'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          plugin_id: field
-        changed:
-          id: changed
-          table: media_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Changed
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: media
-          entity_field: changed
-          plugin_id: field
-        operations:
-          id: operations
-          table: media
-          field: operations
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: false
-          entity_type: media
-          plugin_id: entity_operations
-        riprap_results:
-          id: riprap_results
-          table: media
-          field: riprap_results
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Fixity auditing'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          entity_type: media
-          plugin_id: riprap_results
-      defaults:
-        fields: false
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_media_use'
-        - 'config:field.storage.media.field_mime_type'
-        - extensions
-  rest_export_1:
-    display_plugin: rest_export
-    id: rest_export_1
-    display_title: 'REST export'
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: node/%node/media
-      auth:
-        - basic_auth
-        - jwt_auth
-        - cookie
-      style:
-        type: serializer
-        options:
-          uses_fields: false
-          formats:
-            jsonld: jsonld
-            json: json
-      row:
-        type: data_entity
-        options: {  }
-      fields:
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: false
-            ellipsis: false
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: media
-          entity_field: media
-          plugin_id: field
-        bundle:
-          id: bundle
-          table: media_field_data
-          field: bundle
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_entity_id
-          settings: {  }
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: media
-          entity_field: bundle
-          plugin_id: field
-        field_mime_type:
-          id: field_mime_type
-          table: media__field_mime_type
-          field: field_mime_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'MIME type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          plugin_id: field
-        changed:
-          id: changed
-          table: media_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Changed
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: media
-          entity_field: changed
-          plugin_id: field
-      defaults:
-        fields: false
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_mime_type'
-        - extensions
diff --git a/css/search-result.css b/css/search-result.css
new file mode 100644
index 0000000..88497e4
--- /dev/null
+++ b/css/search-result.css
@@ -0,0 +1,53 @@
+/*
+    Created on : Aug 5, 2019, 2:41:36 PM
+    Author     : Mengyu Zang
+*/
+
+/*
+    Search results
+*/
+.rdm-dataset-search-result-title {
+  font-weight: bold;
+  font-size: 1.4em;
+}
+
+.label {
+  color: white;
+  padding: 0.2em;
+  font-size: 0.8em;
+}
+
+.search-result-subject {
+  font-weight: bold;
+  background-color: #696969;
+}
+
+.search-result-created-date {
+  color: black;
+  float: right;
+}
+.search-result-license-image {
+  height: 18.5px;
+  padding-left: 4px;
+}
+
+/*
+    Facets
+*/
+.block__title {
+  font-size: 1.2em;
+  font-weight: bold;
+  color: #a52a2a;
+}
+.facet-item__value {
+  font-size: 1em;
+}
+.facet-item__count {
+  font-size: 1em;
+}
+.field__item {
+  font-weight: bold;
+}
+.facets-widget-checkbox label {
+  display: inline-block;
+}
diff --git a/islandora_rdm.libraries.yml b/islandora_rdm.libraries.yml
new file mode 100644
index 0000000..eaa87b9
--- /dev/null
+++ b/islandora_rdm.libraries.yml
@@ -0,0 +1,5 @@
+search:
+  version: 1.0
+  css:
+    layout:
+      css/search-result.css: {}
\ No newline at end of file
diff --git a/islandora_rdm_solr_config/config/install/block.block.license.yml b/islandora_rdm_solr_config/config/install/block.block.license.yml
new file mode 100644
index 0000000..a9e0fc6
--- /dev/null
+++ b/islandora_rdm_solr_config/config/install/block.block.license.yml
@@ -0,0 +1,23 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.license
+  module:
+    - facets
+  theme:
+    - carapace
+id: license
+theme: carapace
+region: sidebar_first
+weight: 0
+provider: null
+plugin: 'facet_block:license'
+settings:
+  id: 'facet_block:license'
+  label: License
+  provider: facets
+  label_display: '0'
+  block_id: license
+visibility: {  }
+
diff --git a/islandora_rdm_solr_config/config/install/block.block.publicationyear.yml b/islandora_rdm_solr_config/config/install/block.block.publicationyear.yml
new file mode 100644
index 0000000..9324d08
--- /dev/null
+++ b/islandora_rdm_solr_config/config/install/block.block.publicationyear.yml
@@ -0,0 +1,23 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.publication_year
+  module:
+    - facets
+  theme:
+    - carapace
+id: publicationyear
+theme: carapace
+region: sidebar_first
+weight: 0
+provider: null
+plugin: 'facet_block:publication_year'
+settings:
+  id: 'facet_block:publication_year'
+  label: 'Publication Year'
+  provider: facets
+  label_display: '0'
+  block_id: publicationyear
+visibility: {  }
+
diff --git a/islandora_rdm_solr_config/config/install/block.block.subjects.yml b/islandora_rdm_solr_config/config/install/block.block.subjects.yml
new file mode 100644
index 0000000..1b6a5ac
--- /dev/null
+++ b/islandora_rdm_solr_config/config/install/block.block.subjects.yml
@@ -0,0 +1,23 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.subjects
+  module:
+    - facets
+  theme:
+    - carapace
+id: subjects
+theme: carapace
+region: sidebar_first
+weight: 0
+provider: null
+plugin: 'facet_block:subjects'
+settings:
+  id: 'facet_block:subjects'
+  label: Subjects
+  provider: facets
+  label_display: '0'
+  block_id: subjects
+visibility: {  }
+
diff --git a/islandora_rdm_solr_config/config/install/facets.facet.license.yml b/islandora_rdm_solr_config/config/install/facets.facet.license.yml
new file mode 100644
index 0000000..8ab46e3
--- /dev/null
+++ b/islandora_rdm_solr_config/config/install/facets.facet.license.yml
@@ -0,0 +1,63 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.default_solr_index
+    - views.view.solr_search_content
+  module:
+    - search_api
+id: license
+name: License
+url_alias: license
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: title_1
+facet_source_id: 'search_api:views_page__solr_search_content__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: true
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+    show_reset_link: false
+    reset_text: 'Show all'
+    hide_reset_when_no_selection: false
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: false
+processor_configs:
+  active_widget_order:
+    processor_id: active_widget_order
+    weights:
+      sort: 20
+    settings:
+      sort: DESC
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: 30
+    settings:
+      sort: DESC
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: true
+
diff --git a/islandora_rdm_solr_config/config/install/facets.facet.publication_year.yml b/islandora_rdm_solr_config/config/install/facets.facet.publication_year.yml
new file mode 100644
index 0000000..196ae6c
--- /dev/null
+++ b/islandora_rdm_solr_config/config/install/facets.facet.publication_year.yml
@@ -0,0 +1,63 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.default_solr_index
+    - views.view.solr_search_content
+  module:
+    - search_api
+id: publication_year
+name: 'Publication Year'
+url_alias: publication_year
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_rdm_publication_year
+facet_source_id: 'search_api:views_page__solr_search_content__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: true
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+    show_reset_link: false
+    reset_text: 'Show all'
+    hide_reset_when_no_selection: false
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: false
+processor_configs:
+  active_widget_order:
+    processor_id: active_widget_order
+    weights:
+      sort: 20
+    settings:
+      sort: DESC
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: 30
+    settings:
+      sort: DESC
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: true
+
diff --git a/islandora_rdm_solr_config/config/install/facets.facet.subjects.yml b/islandora_rdm_solr_config/config/install/facets.facet.subjects.yml
new file mode 100644
index 0000000..7e8f606
--- /dev/null
+++ b/islandora_rdm_solr_config/config/install/facets.facet.subjects.yml
@@ -0,0 +1,63 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.default_solr_index
+    - views.view.solr_search_content
+  module:
+    - search_api
+id: subjects
+name: Subjects
+url_alias: subjects
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_subjects
+facet_source_id: 'search_api:views_page__solr_search_content__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: true
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+    show_reset_link: false
+    reset_text: 'Show all'
+    hide_reset_when_no_selection: false
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: false
+processor_configs:
+  active_widget_order:
+    processor_id: active_widget_order
+    weights:
+      sort: 20
+    settings:
+      sort: DESC
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: 30
+    settings:
+      sort: DESC
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: true
+
diff --git a/islandora_rdm_solr_config/config/optional/search_api.index.default_solr_index.yml b/islandora_rdm_solr_config/config/install/search_api.index.default_solr_index.yml
old mode 100755
new mode 100644
similarity index 68%
rename from islandora_rdm_solr_config/config/optional/search_api.index.default_solr_index.yml
rename to islandora_rdm_solr_config/config/install/search_api.index.default_solr_index.yml
index 714e2b9..07fb886
--- a/islandora_rdm_solr_config/config/optional/search_api.index.default_solr_index.yml
+++ b/islandora_rdm_solr_config/config/install/search_api.index.default_solr_index.yml
@@ -5,13 +5,13 @@ dependencies:
     - search_api_solr
     - node
     - user
-    - paragraphs
+    - taxonomy
     - search_api
-    - media
   config:
-    - field.storage.media.field_edited_text
-    - field.storage.node.field_rdm_creator
-    - field.storage.paragraph.field_rdm_personal_name
+    - field.storage.node.field_rdm_license
+    - field.storage.taxonomy_term.field_license_link
+    - field.storage.node.field_rdm_publication_year
+    - field.storage.node.field_subjects
     - field.storage.node.field_tags
     - search_api.server.default_solr_server
     - core.entity_view_mode.node.search_index
@@ -70,17 +70,22 @@ field_settings:
     dependencies:
       module:
         - node
-  field_rdm_personal_name:
-    label: 'Creator » Paragraph » Personal Name'
+  field_rdm_publication_year:
+    label: 'Publication Year'
     datasource_id: 'entity:node'
-    property_path: 'field_rdm_creator:entity:field_rdm_personal_name'
-    type: text
+    property_path: field_rdm_publication_year
+    type: string
     dependencies:
       config:
-        - field.storage.node.field_rdm_creator
-        - field.storage.paragraph.field_rdm_personal_name
-      module:
-        - paragraphs
+        - field.storage.node.field_rdm_publication_year
+  field_subjects:
+    label: Subjects
+    datasource_id: 'entity:node'
+    property_path: field_subjects
+    type: string
+    dependencies:
+      config:
+        - field.storage.node.field_subjects
   field_tags:
     label: Tags
     datasource_id: 'entity:node'
@@ -96,14 +101,6 @@ field_settings:
     indexed_locked: true
     type_locked: true
     hidden: true
-  processed:
-    label: 'Edited Text » Processed text'
-    datasource_id: 'entity:media'
-    property_path: 'field_edited_text:processed'
-    type: text
-    dependencies:
-      config:
-        - field.storage.media.field_edited_text
   rendered_item:
     label: 'Rendered item'
     property_path: rendered_item
@@ -112,41 +109,13 @@ field_settings:
       roles:
         anonymous: anonymous
       view_mode:
-        'entity:media':
-          audio: ''
-          extracted_text: ''
-          file: ''
-          fits_technical_metadata: ''
-          image: ''
-          pdf: ''
-          remote_video: ''
-          video: ''
         'entity:node':
           article: search_index
-          data_management_plan: default
-          funding_information: default
-          islandora_object: ''
-          islandora_rdm_dataset: default
+          data_management_plan: search_index
+          funding_information: search_index
+          islandora_object: search_index
+          islandora_rdm_dataset: search_index
           page: search_index
-        'entity:paragraph':
-          alternate_identifier: ''
-          rdm_contribution_organizational: ''
-          rdm_contribution_personal: ''
-          rdm_organization: ''
-          rdm_organizational_identifier: ''
-          rdm_person: ''
-          rdm_personal_identifier: ''
-          related_resource: ''
-          typed_date: ''
-          typed_description: ''
-  rendered_item_1:
-    label: 'Rendered HTML output'
-    property_path: rendered_item
-    type: text
-    configuration:
-      roles:
-        - anonymous
-      view_mode: {  }
   status:
     label: 'Publishing status'
     datasource_id: 'entity:node'
@@ -174,6 +143,17 @@ field_settings:
     dependencies:
       module:
         - node
+  title_1:
+    label: 'License » Taxonomy term » License link » Link text'
+    datasource_id: 'entity:node'
+    property_path: 'field_rdm_license:entity:field_license_link:title'
+    type: string
+    dependencies:
+      config:
+        - field.storage.node.field_rdm_license
+        - field.storage.taxonomy_term.field_license_link
+      module:
+        - taxonomy
   type:
     label: 'Content type'
     datasource_id: 'entity:node'
@@ -193,13 +173,6 @@ field_settings:
       module:
         - node
 datasource_settings:
-  'entity:media':
-    bundles:
-      default: true
-      selected: {  }
-    languages:
-      default: true
-      selected: {  }
   'entity:node':
     bundles:
       default: true
@@ -207,13 +180,6 @@ datasource_settings:
     languages:
       default: true
       selected: {  }
-  'entity:paragraph':
-    bundles:
-      default: true
-      selected: {  }
-    languages:
-      default: true
-      selected: {  }
 processor_settings:
   add_url:
     weights:
@@ -255,3 +221,4 @@ options:
   index_directly: true
   cron_limit: 50
 server: default_solr_server
+
diff --git a/islandora_rdm_solr_config/config/install/search_api_solr.settings.yml b/islandora_rdm_solr_config/config/install/search_api_solr.settings.yml
deleted file mode 100755
index 6ebe37c..0000000
--- a/islandora_rdm_solr_config/config/install/search_api_solr.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-last_optimize: 0
-cron_action: spellcheck
-site_hash: nnu4k6
diff --git a/config/optional/views.view.rdm_solr_search_content.yml b/islandora_rdm_solr_config/config/install/views.view.solr_search_content.yml
similarity index 84%
rename from config/optional/views.view.rdm_solr_search_content.yml
rename to islandora_rdm_solr_config/config/install/views.view.solr_search_content.yml
index 194567c..129b220 100644
--- a/config/optional/views.view.rdm_solr_search_content.yml
+++ b/islandora_rdm_solr_config/config/install/views.view.solr_search_content.yml
@@ -6,11 +6,11 @@ dependencies:
   module:
     - search_api
 _core:
-  default_config_hash: HOLKQFo9Gxd0-FHu9o5XZeZbGOFMmJpFCwDguu0nGgI
-id: rdm_solr_search_content
-label: 'RDM Solr search content'
+  default_config_hash: WL4w5mZNKQaKr_LN6ix_lTtr-GqNDdB468D-WjlTtD0
+id: solr_search_content
+label: 'Solr search content'
 module: views
-description: 'An unfiltered search page configured to search through the content of your site'
+description: 'A search page preconfigured to search through the content of your site'
 tag: ''
 base_table: search_api_index_default_solr_index
 base_field: search_api_id
@@ -69,7 +69,10 @@ display:
           view_modes:
             'entity:node':
               article: search_result
-              islandora_object: teaser
+              data_management_plan: search_result
+              funding_information: search_result
+              islandora_object: search_result
+              islandora_rdm_dataset: search_result
               page: search_result
       filters:
         search_api_fulltext:
@@ -79,26 +82,24 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          operator: or
+          operator: and
           value: ''
           group: 1
           exposed: true
           expose:
-            operator_id: search_api_fulltext_op
-            label: 'Fulltext search'
+            operator_id: search_op
+            label: Search
             description: ''
             use_operator: false
-            operator: search_api_fulltext_op
-            identifier: search_api_fulltext
-            required: false
+            operator: search_op
+            identifier: keys
+            required: true
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-              fedoraadmin: '0'
-            placeholder: ''
           is_grouped: false
           group_info:
             label: ''
@@ -112,7 +113,7 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           parse_mode: terms
-          min_length: null
+          min_length: 3
           fields: {  }
           plugin_id: search_api_fulltext
       sorts: {  }
@@ -133,10 +134,6 @@ display:
       relationships: {  }
       arguments: {  }
       display_extenders: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
     cache_metadata:
       contexts:
         - 'languages:language_interface'
@@ -153,7 +150,10 @@ display:
     display_options:
       display_extenders: {  }
       path: solr-search/content
-      exposed_block: true
+      cache:
+        type: none
+      defaults:
+        cache: false
     cache_metadata:
       contexts:
         - 'languages:language_interface'
@@ -162,3 +162,4 @@ display:
       cacheable: false
       max-age: -1
       tags: {  }
+
diff --git a/islandora_rdm_solr_config/config/optional/search_api.server.default_solr_server.yml b/islandora_rdm_solr_config/config/optional/search_api.server.default_solr_server.yml
deleted file mode 100755
index 5d4227b..0000000
--- a/islandora_rdm_solr_config/config/optional/search_api.server.default_solr_server.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api_solr.solr_field_type.text_phonetic_und_7_0_0
-    - search_api_solr.solr_field_type.text_und_7_0_0
-  module:
-    - search_api_solr
-id: default_solr_server
-name: 'Solr Server'
-description: 'Default Solr server created by the Solr Search Defaults module'
-backend: search_api_solr
-backend_config:
-  connector: standard
-  connector_config:
-    scheme: http
-    host: localhost
-    port: '8983'
-    path: /solr
-    core: CLAW
-    timeout: 5
-    index_timeout: 10
-    optimize_timeout: 15
-    finalize_timeout: 30
-    commit_within: 1000
-    solr_version: ''
-    http_method: AUTO
-    jmx: false
-  retrieve_data: false
-  highlight_data: false
-  skip_schema_check: false
-  server_prefix: ''
-  domain: generic
-  site_hash: true
diff --git a/islandora_rdm_solr_config/islandora_rdm_solr_config.features.yml b/islandora_rdm_solr_config/islandora_rdm_solr_config.features.yml
deleted file mode 100755
index 7ddbeae..0000000
--- a/islandora_rdm_solr_config/islandora_rdm_solr_config.features.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bundle: islandora_rdm
-required: true
diff --git a/islandora_rdm_solr_config/islandora_rdm_solr_config.info.yml b/islandora_rdm_solr_config/islandora_rdm_solr_config.info.yml
old mode 100755
new mode 100644
index af0ea9b..75be429
--- a/islandora_rdm_solr_config/islandora_rdm_solr_config.info.yml
+++ b/islandora_rdm_solr_config/islandora_rdm_solr_config.info.yml
@@ -1,6 +1,11 @@
-name: 'Solr Config'
+name: 'Islandora RDM Solr Config'
 type: module
 core: 8.x
 dependencies:
+  - block
+  - block_content
+  - facets
   - search_api_solr
-package: 'Islandora RDM'
+  - media_attribution
+  - vefl
+package: islandora_rdm
diff --git a/templates/node--islandora-rdm-dataset--search-result.html.twig b/templates/node--islandora-rdm-dataset--search-result.html.twig
index f47cb30..6fcc405 100755
--- a/templates/node--islandora-rdm-dataset--search-result.html.twig
+++ b/templates/node--islandora-rdm-dataset--search-result.html.twig
@@ -1,6 +1,7 @@
    
-{% set created_date = node.getCreatedTime|format_date('umami_dates') %}
-{{ attach_library('classy/node') }} {# apply classy theme to node}
+{% set created_date = node.getCreatedTime|date("Y/m/d") %}
+{{ attach_library('classy/node') }} {# apply classy theme to node#}
+{{ attach_library('islandora_rdm/search') }} {# attach the library declared in the .libraries.yml file to the page when a search result is displayed.#}
                                     
 {# Format Creator (PublicationYear): Title. Publisher. (resourceTypeGeneral). Identifier #}
 <h2 class= "rdm-dataset-search-result-title">
@@ -9,13 +10,12 @@
     <a href="{{url}}"class="node__title-link">{{- label -}}</a>. 
     {{ node.field_rdm_publisher.0.entity.field_rdm_organization_name.value }}. 
     {{ node.field_rdm_resource_type_general.value }}. 
-    <a href="https://doi.org/{{node.field_islandora_rdm_identifier.value}}">{{ node.field_islandora_rdm_identifier.value }}</a></h2>
+    <a href="https://doi.org/{{node.field_islandora_rdm_identifier.value}}">{{ "https://doi.org/"}}{{ node.field_islandora_rdm_identifier.value }}</a></h2>
     
 <p>{{ rdm_abstract }}</p>
-
-<p><span class= "search-result-subject">{{ node.field_subjects.value }}  </span>
-   <span class= "search-result-rights">{{ node.field_rights.value }}  </span>
-   <span class= "search-result-created-date">{{ created_date }}</span></p>
+<p><span class= "label search-result-subject">{{ node.field_subjects.value }}</span>
+   <a href="{{ node.field_rdm_license.entity.field_license_link.0.url }}"><img class="search-result-license-image" src="{{ file_url(node.field_rdm_license.entity.field_license_icon.entity.fileuri) }}" alt="access right" > </a>
+   <span class= "label search-result-created-date">{{"Uploaded on "}}{{created_date }}</span></p>