diff --git a/blocks/resource-block/init.php b/blocks/resource-block/init.php
index 63f541a..b008918 100644
--- a/blocks/resource-block/init.php
+++ b/blocks/resource-block/init.php
@@ -147,11 +147,13 @@ function oer_display_resource_block( $attributes, $ajax = false ){
 
             <?php if ($showGrades=="true"): 
                 $grade_levels = oer_resource_block_grade_levels($resource->ID);
+                if ($grade_levels):
                 ?>
-            <div class="oer-resource-block-grade-levels">
-                <strong><?php esc_html_e('Grade Levels', OER_SLUG); ?>: </strong> <?php echo esc_html($grade_levels); ?>
-            </div>
-            <?php endif; ?>
+                <div class="oer-resource-block-grade-levels">
+                    <strong><?php esc_html_e('Grade Levels', OER_SLUG); ?>: </strong> <?php echo esc_html($grade_levels); ?>
+                </div>
+            <?php endif;
+            endif; ?>
         </div>
 
         <?php
@@ -174,12 +176,14 @@ function oer_resource_block_subjects($resource_id){
     $subjects = array();
     $subj_arr = get_the_terms($resource_id, 'resource-subject-area');
     
-    foreach ($subj_arr as $subj){
-        $subjects[] = array(
-                        "term_id" => $subj->term_id,
-                        "name" => $subj->name,
-                        "term_link" => get_term_link($subj->term_id,'resource-subject-area')
-                        );
+    if (is_array($subj_arr)){
+        foreach ($subj_arr as $subj){
+            $subjects[] = array(
+                            "term_id" => $subj->term_id,
+                            "name" => $subj->name,
+                            "term_link" => get_term_link($subj->term_id,'resource-subject-area')
+                            );
+        }
     }
     return $subjects;
 }
diff --git a/blocks/subject-resources-block-v2/build/style-index.css b/blocks/subject-resources-block-v2/build/style-index.css
index 82c587f..460acc6 100644
--- a/blocks/subject-resources-block-v2/build/style-index.css
+++ b/blocks/subject-resources-block-v2/build/style-index.css
@@ -1 +1 @@
-.oer-subject-resources-list .post.oer-snglrsrc{border-bottom:1px solid #cdcdcd;margin:0 0 25px;overflow:hidden;padding-bottom:15px}.oer-subject-resources-list .post.oer-snglrsrc .oer-resource-link{float:left;width:25%}.oer-subject-resources-list .post.oer-snglrsrc .oer-snglttldscrght{float:right;margin:0;overflow:hidden;padding:0 0 0 10px;width:75%}.oer-subject-resources-list .post.oer-snglrsrc .oer-snglttldscrght .ttl{line-height:1em}.oer-snglttldscrght .desc{float:left;font-size:14px;line-height:21px;margin:10px 0;padding:0;width:100%}.oer-subject-resources-list .oer-snglrsrchdng{border-bottom:1px solid #cdcdcd;margin-bottom:15px}.oer-subject-resources-list .oer-snglrsrchdng .count-option{display:inline-block}.oer-subject-resources-list .oer-snglrsrchdng .count-option .countoption{color:#6b6b6b;font-weight:700}.oer-subject-resources-list .oer-snglrsrchdng .resource-count{margin:0 3px}.oer-subject-resources-list .oer-snglrsrchdng .count-options{display:none;position:absolute}.oer-subject-resources-list .oer-snglrsrchdng .count-options ul.countList{background:#f1f1f1;border:1px solid #cdcdcd;list-style:none;padding-left:0}.oer-subject-resources-list .oer-snglrsrchdng .count-options ul.countList li{font-size:.75em;padding:8px 15px}.oer-subject-resources-list .oer-snglrsrchdng .count-options ul.countList li:focus,.oer-subject-resources-list .oer-snglrsrchdng .count-options ul.countList li:hover{background:#9fd5f9;cursor:pointer}.oer-subject-resources-list .oer-snglrsrchdng .sort-box{display:inline-block;width:49.5%}.oer-subject-resources-list .oer-snglrsrchdng .sort-box .sortoption{color:#6b6b6b;font-size:1em;font-weight:700;margin-right:0}.count-option .count-selectbox{display:none}.oer-snglrsrc .oer-snglttldscrght .post-meta .post-meta-grades{margin-right:2%}.oer-subject-resources-list .oer-snglrsrc .oer-snglttldscrght .tagcloud span{display:inline-block;margin:5px 0}.oer-subject-resources-list .oer-snglrsrc .oer-snglttldscrght .tagcloud span a{background:#0073aa;border-radius:5px;color:#fff;font-size:16px;margin:0 5px;padding:8px 15px;text-decoration:none}.oer-subject-resources-list .oer-snglrsrc .oer-snglttldscrght .tagcloud span a:focus,.oer-subject-resources-list .oer-snglrsrc .oer-snglttldscrght .tagcloud span a:hover{background:#8eceed;color:#000}.oer-subject-resources-list .oer-snglrsrchdng .browse-box{display:inline-block;width:49.5%}.oer-subject-resources-list .oer-snglrsrchdng .sort-box .sort-options{background-color:#f1f1f1}.oer-subject-resources-list .post.oer-snglrsrc .oer-snglttldscrght .ttl{float:none}.oer-subject-resources-list .post.oer-snglrsrc .oer-snglttldscrght .post-meta{margin:0}@media screen and (max-width:600px){.oer-subject-resources-list .oer-snglrsrchdng .sort-box{font-size:14px;vertical-align:top;width:54.5%}.oer-subject-resources-list .oer-snglrsrchdng .browse-box{font-size:14px;vertical-align:top;width:44.5%}.oer-subject-resources-list .post.oer-snglrsrc{width:100%}.oer-subject-resources-list .post.oer-snglrsrc .oer-resource-link{float:none;width:100%}.oer-subject-resources-list .post.oer-snglrsrc .oer-resource-link .oer-snglimglft{margin-bottom:5px}.oer-subject-resources-list .post.oer-snglrsrc .oer-snglttldscrght{float:none;width:100%}.oer-subject-resources-list .post.oer-snglrsrc .oer-snglttldscrght .ttl a{font-size:20px;font-weight:700;line-height:1.25em}.oer-snglrsrc .oer-snglttldscrght .post-meta .post-meta-box{display:block;font-size:16px}}
+.oer-subject-resources-list .post.oer-snglrsrc{border-bottom:1px solid #cdcdcd;margin:0 0 25px;overflow:hidden;padding-bottom:15px}.oer-subject-resources-list .post.oer-snglrsrc .oer-resource-link{float:left;width:25%}.oer-subject-resources-list .post.oer-snglrsrc .oer-snglttldscrght{float:right;margin:0;overflow:hidden;padding:0 0 0 10px;width:75%}.oer-subject-resources-list .post.oer-snglrsrc .oer-snglttldscrght .ttl{line-height:1em}.oer-snglttldscrght .desc{float:left;font-size:14px;line-height:21px;margin:10px 0;padding:0;width:100%}.oer-subject-resources-list .oer-snglrsrchdng{border-bottom:1px solid #cdcdcd;margin-bottom:15px}.oer-subject-resources-list .oer-snglrsrchdng .count-option{display:inline-block}.oer-subject-resources-list .oer-snglrsrchdng .count-option .countoption{color:#6b6b6b;font-weight:700}.oer-subject-resources-list .oer-snglrsrchdng .resource-count{margin:0 3px}.oer-subject-resources-list .oer-snglrsrchdng .count-options{display:none;position:absolute}.oer-subject-resources-list .oer-snglrsrchdng .count-options ul.countList{background:#f1f1f1;border:1px solid #cdcdcd;list-style:none;padding-left:0}.oer-subject-resources-list .oer-snglrsrchdng .count-options ul.countList li{font-size:.75em;padding:8px 15px}.oer-subject-resources-list .oer-snglrsrchdng .count-options ul.countList li:focus,.oer-subject-resources-list .oer-snglrsrchdng .count-options ul.countList li:hover{background:#9fd5f9;cursor:pointer}.oer-subject-resources-list .oer-snglrsrchdng .sort-box{display:inline-block;width:49.5%}.oer-subject-resources-list .oer-snglrsrchdng .sort-box .sortoption{color:#6b6b6b;font-size:1em;font-weight:700;margin-right:0}.count-option .count-selectbox{display:none}.oer-snglrsrc .oer-snglttldscrght .post-meta .post-meta-grades{margin-right:2%}.oer-subject-resources-list .oer-snglrsrc .oer-snglttldscrght .tagcloud span{display:inline-block;margin:5px 0}.oer-subject-resources-list .oer-snglrsrc .oer-snglttldscrght .tagcloud span a{background:#0073aa;border-radius:5px;color:#fff;font-size:16px;margin:0 5px;padding:8px 15px;text-decoration:none}.oer-subject-resources-list .oer-snglrsrc .oer-snglttldscrght .tagcloud span a:focus,.oer-subject-resources-list .oer-snglrsrc .oer-snglttldscrght .tagcloud span a:hover{background:#8eceed;color:#000}.oer-subject-resources-list .oer-snglrsrchdng .browse-box{display:inline-block;width:49.5%}.oer-subject-resources-list .oer-snglrsrchdng .sort-box .sort-options{background-color:#fff}.oer-subject-resources-list .post.oer-snglrsrc .oer-snglttldscrght .ttl{float:none}.oer-subject-resources-list .post.oer-snglrsrc .oer-snglttldscrght .post-meta{margin:0}@media screen and (max-width:600px){.oer-subject-resources-list .oer-snglrsrchdng .sort-box{font-size:14px;vertical-align:top;width:54.5%}.oer-subject-resources-list .oer-snglrsrchdng .browse-box{font-size:14px;vertical-align:top;width:44.5%}.oer-subject-resources-list .post.oer-snglrsrc{width:100%}.oer-subject-resources-list .post.oer-snglrsrc .oer-resource-link{float:none;width:100%}.oer-subject-resources-list .post.oer-snglrsrc .oer-resource-link .oer-snglimglft{margin-bottom:5px}.oer-subject-resources-list .post.oer-snglrsrc .oer-snglttldscrght{float:none;width:100%}.oer-subject-resources-list .post.oer-snglrsrc .oer-snglttldscrght .ttl a{font-size:20px;font-weight:700;line-height:1.25em}.oer-snglrsrc .oer-snglttldscrght .post-meta .post-meta-box{display:block;font-size:16px}}
diff --git a/blocks/subject-resources-block-v2/init.php b/blocks/subject-resources-block-v2/init.php
index 445f41e..5565600 100644
--- a/blocks/subject-resources-block-v2/init.php
+++ b/blocks/subject-resources-block-v2/init.php
@@ -591,7 +591,11 @@ function oer_ajax_get_subject_resources(){
     // Sanitize POST parameters
     $params = array();
     $params['action'] = sanitize_text_field($_POST['action']);
-    $params['attributes'] = $_POST['attributes'];
+    if (isset($_POST['attributes']))
+        $params['attributes'] = $_POST['attributes'];
+    else
+        $params['attributes'] = $_POST;
+
     array_walk($params['attributes'], function(&$value, &$key){
         $value['displayCount'] = sanitize_text_field($value['displayCount']);
         $value['sort'] = sanitize_text_field($value['sort']);
diff --git a/css/back_styles.css b/css/back_styles.css
index 33e71bb..f4bf028 100644
--- a/css/back_styles.css
+++ b/css/back_styles.css
@@ -207,9 +207,9 @@ ul.oer_slctstandard > li
 	border: 1px solid #cccccc;
 	padding-left: 10px;
 }
-.oer-plugin-footer { margin:10px 0 0; }
-.oer-plugin-info {  display:inline-block; }
-.oer-plugin-link { display:inline-block; margin-left:10px; }
+.oer-plugin-footer { margin:10px 0 0; font-size:0.9em; }
+.oer-plugin-info {  display:inline-block; width: 49%; }
+.oer-plugin-link { display:inline-block; margin-left:10px; width:48%; text-align:right; }
 .clear { clear:both; }
 #col-standards-left { width:40%; float:left; }
 #col-standards-left .oer_pargrph { width:auto; float:none; }
@@ -221,8 +221,9 @@ ul.oer_slctstandard > li
 .oer-plugin-row:first-child, .oer-import-row:first-child { padding:15px 15px 0; }
 .oer-import-row:first-child { padding:10px 0 0; }
 .oer-import-row { padding:0; }
-.oer-plugin-row .oer-row-left, .oer-import-row .row-left { width:63%; float:left; }
-.oer-plugin-row .oer-row-right, .oer-import-row .row-right { width:35%; float:right; }
+.oer-import-row .row-left .fields table.form-table td label { display:inline; }
+.oer-plugin-row .oer-row-left, .oer-import-row .row-left { width:68%; float:left; }
+.oer-plugin-row .oer-row-right, .oer-import-row .row-right { width:30%; float:right; }
 .oer-import-row .row2-left { width:85%; float:left; }
 .oer-import-row .row2-right { width:13%; float:right; }
 .oer-plugin-row fieldset, .oer-import-row fieldset { margin-bottom:15px; }
diff --git a/css/front_styles.css b/css/front_styles.css
index 682b7aa..59e4d8f 100644
--- a/css/front_styles.css
+++ b/css/front_styles.css
@@ -441,6 +441,7 @@ li.oer_sbstndard{
 .search-results .type-resource .entry-header h2.entry-title { margin-bottom:0; }
 .search-results .type-resource .entry-header h5.post-meta { margin-bottom:1.05em; }
 .search-results .type-resource .entry-header h5.post-meta .post-meta-box { margin-right:15px; }
+.search-results #content #posts-container .pagination { margin-bottom:20px; }
 article.oer_sngl_resource_wrapper div#sngl-resource header.entry-header h1.entry-title {font-size: 20px; line-height: 30px;}
 .oer-standards #content, .standards-template #content,
 .substandards-template #content, .notation-template #content { width:100%; }
@@ -659,4 +660,11 @@ div#oer_related_resources_list label input {
 .twenty-thirteen .wp-block-wp-oer-plugin-wp-oer-subjects-index .oer-cntnr .oer-ctgry-cntnr .oer_snglctwpr .oer-cat-div .oer-cat-txt-btm-cntnr ul li span:last-child { position:absolute; top:0; right:0; }
 .twenty-twelve .wp-block-wp-oer-plugin-wp-oer-subjects-index .oer-cntnr .oer-ctgry-cntnr .oer_snglctwpr .oer-cat-div .oer-cat-txt-btm-cntnr ul li { margin-top:35px; margin-left:0; }
 .twenty-twelve .wp-block-wp-oer-plugin-wp-oer-subjects-index .oer-cntnr .oer-ctgry-cntnr .oer_snglctwpr .oer-cat-div .oer-cat-txt-btm-cntnr ul li .oer-mne-sbjct-ttl { width:45%; }
-.oer-subject-resources-list .oer-snglrsrc .oer-snglttldscrght .tagcloud span { margin:10px 0; }
\ No newline at end of file
+.oer-subject-resources-list .oer-snglrsrc .oer-snglttldscrght .tagcloud span { margin:10px 0; }
+.tc-oer-subject-areas-list li.lp-subject-hidden i {
+    display: inline-flex;
+    flex-direction: column;
+    justify-content: center;
+    margin-left: 3px;
+    margin-right: 3px;
+}
\ No newline at end of file
diff --git a/css/resource-style.css b/css/resource-style.css
index dd0ff14..dbfc9ff 100644
--- a/css/resource-style.css
+++ b/css/resource-style.css
@@ -124,6 +124,7 @@ p.center { text-align:center; }
 .oer-lp-full-content {
     display: none;
 }
+.oer-lp-full-content .bx-wrapper.mobile .featuredwpr_bxslider li { width:375px !important; }
 .oer-lp-full-content pre {
     white-space: normal !important;
 }
diff --git a/includes/import.php b/includes/import.php
index 0fcd546..469704e 100644
--- a/includes/import.php
+++ b/includes/import.php
@@ -70,9 +70,9 @@
 	</div>
     </div>
 </div><!-- /.wrap -->
-<div class="plugin-footer">
-	<div class="plugin-info"><?php echo OER_ADMIN_PLUGIN_NAME . " " . OER_VERSION .""; ?></div>
-	<div class="plugin-link"><a href="<?php echo esc_url('https://www.wp-oer.com/') ?>" target="_blank"><?php esc_html_e("More Information", OER_SLUG); ?></a></div>
+<div class="oer-plugin-footer">
+	<div class="oer-plugin-info"><?php echo OER_ADMIN_PLUGIN_NAME . " " . OER_VERSION .""; ?></div>
+	<div class="oer-plugin-link"><a href="<?php echo esc_url('https://www.wp-oer.com/') ?>" target="_blank"><?php esc_html_e("More Information", OER_SLUG); ?></a></div>
 	<div class="clear"></div>
 </div>
 <?php oer_display_loader(); ?>
diff --git a/includes/init.php b/includes/init.php
index b001602..e939c02 100644
--- a/includes/init.php
+++ b/includes/init.php
@@ -385,17 +385,16 @@ function oer_update_subject_area_meta( $term_id, $tt_id ){
 function oer_save_customfields()
 {
     global $post, $wpdb, $_oer_prefix;
-    
+
     //Check first if screenshot is enabled
     $screenshot_enabled = get_option( 'oer_enable_screenshot' );
     $external_screenshot = get_option('oer_external_screenshots');
     
     //Check first if $post is not empty
     if ($post) {
-	if($post->post_type == 'resource')
-	{
-	    if (isset($_GET['action']) && (sanitize_text_field($_GET['action'])=="trash" || sanitize_text_field($_GET['action'])=="untrash")){
-		return; 
+		if($post->post_type == 'resource'){
+		    if (isset($_GET['action']) && (sanitize_text_field($_GET['action'])=="trash" || sanitize_text_field($_GET['action'])=="untrash")){
+			return; 
 	    }
 	    if (!isset($_POST['oer_metabox_nonce_field']) || !wp_verify_nonce( $_POST['oer_metabox_nonce_field'], 'oer_metabox_action' )) {
 		    wp_die('Nonce verification failed');
@@ -427,20 +426,20 @@ function oer_save_customfields()
 		{
 			update_post_meta( $post->ID , 'oer_grade' , '');
 		}
-    
-    // Save Age Levels
+    	
+    	// Save Age Levels
 		if(isset($_POST['oer_age_levels']))
 		{
 		    update_post_meta( $post->ID , 'oer_age_levels' , sanitize_text_field($_POST['oer_age_levels']));
 		}
     
-    // Save Instructional Time
+    	// Save Instructional Time
 		if(isset($_POST['oer_instructional_time']))
 		{
 		    update_post_meta( $post->ID , 'oer_instructional_time' , sanitize_text_field($_POST['oer_instructional_time']));
 		}
     
-    // Save Creative Commons License
+    	// Save Creative Commons License
 		if(isset($_POST['oer_creativecommons_license']))
 		{
 		    update_post_meta( $post->ID , 'oer_creativecommons_license' , sanitize_text_field($_POST['oer_creativecommons_license']));
@@ -558,11 +557,17 @@ function oer_save_customfields()
 		if(isset($_POST['oer_authortype2']))
 		{
 			update_post_meta( $post->ID , 'oer_authortype2' , sanitize_text_field($_POST['oer_authortype2']));
+		} else {
+			if (get_post_meta($post->ID, 'oer_authortype2'))
+				delete_post_meta($post->ID, 'oer_authortype2');
 		}
 
 		if(isset($_POST['oer_authorname2']))
 		{
 			update_post_meta( $post->ID , 'oer_authorname2' , sanitize_text_field($_POST['oer_authorname2']));
+		} else {
+			if (get_post_meta($post->ID, 'oer_authorname2'))
+				delete_post_meta($post->ID, 'oer_authorname2');
 		}
 
 		if(isset($_POST['oer_authorurl2']))
@@ -576,11 +581,17 @@ function oer_save_customfields()
 				}
 			}
 			update_post_meta( $post->ID , 'oer_authorurl2' , $oer_authorurl2);
+		} else {
+			if (get_post_meta($post->ID, 'oer_authorurl2'))
+				delete_post_meta($post->ID, 'oer_authorurl2');
 		}
 
 		if(isset($_POST['oer_authoremail2']))
 		{
 			update_post_meta( $post->ID , 'oer_authoremail2' , sanitize_email($_POST['oer_authoremail2']));
+		} else {
+			if (get_post_meta($post->ID, 'oer_authoremail2'))
+				delete_post_meta($post->ID, 'oer_authoremail2');
 		}
 
 		if(isset($_POST['oer_publishername']))
diff --git a/includes/oer-functions.php b/includes/oer-functions.php
index 6487403..2b6ec18 100644
--- a/includes/oer-functions.php
+++ b/includes/oer-functions.php
@@ -2415,10 +2415,10 @@ function oer_generate_sll_resource_embed_code($url){
 	
 	$sll_resource_id = oer_get_ssl_resource_id($url);
 	
-	//Generate embed code
+	//Generate SLL Resource embed code
 	if ($sll_resource_id) {
-		wp_enqueue_script('learninglab-resource', 'https://learninglab.si.edu/embed/widget/q/r/'.$sll_resource_id.'/embed.js');
-		//$embed_code = '<script type="text/javascript" src="https://learninglab.si.edu/embed/widget/q/r/'.$sll_resource_id.'/embed.js"></script><div class="sll-embed" data-widget-type="r" data-widget-key="'.$sll_resource_id.'"></div>';
+		wp_register_script( 'learninglab-resource' , 'https://learninglab.si.edu/embed/widget/q/r/'.$sll_resource_id.'/embed.js' , '', null, true );
+		wp_enqueue_script( 'learninglab-resource' );
 		$embed_code = '<div class="sll-embed" data-widget-type="r" data-widget-key="'.$sll_resource_id.'"></div>';
 	}
 	return $embed_code;
@@ -2438,11 +2438,10 @@ function oer_generate_sll_collection_embed_code($url){
 	$embed_code = "";
 	
 	$sll_collection_id = oer_get_ssl_collection_id($url);
-	
-	//Generate embed code
+	//Generate SLL Collection embed code
 	if ($sll_collection_id) {
-		wp_enqueue_script('learninglab-collection', 'https://learninglab.si.edu/embed/widget/q/c/'.$sll_collection_id.'/embed.js');
-		//$embed_code = '<script type="text/javascript" src="https://learninglab.si.edu/embed/widget/q/c/'.$sll_collection_id.'/embed.js"></script><div class="sll-embed" data-widget-type="c" data-widget-key="'.$sll_collection_id.'"></div>';
+		wp_register_script( 'learninglab-collection' , 'https://learninglab.si.edu/embed/widget/q/c/'.$sll_collection_id.'/embed.js' , '' , null, true );
+		wp_enqueue_script('learninglab-collection');
 		$embed_code = '<div class="sll-embed" data-widget-type="c" data-widget-key="'.$sll_collection_id.'"></div>';
 	}
 	return $embed_code;
@@ -3474,7 +3473,10 @@ function oer_get_standard_label($slug){
 	$results = $wpdb->get_results( $wpdb->prepare( "SELECT * from " . $wpdb->prefix. $table_name . " where id = %s" , $id ) , ARRAY_A);
 	if (!empty($results)){
 		foreach($results as $result) {
-			$standard = $result['description'];
+			if ($table_name == "oer_sub_standards")
+				$standard = $result['standard_title'];
+			else
+				$standard = $result['description'];
 		}
 	}
 	
@@ -3531,7 +3533,7 @@ function oer_standards_list_display($resource_id){
                    foreach($stds as $std){
                        if (isset($std['core_standard_id'])) {
                            echo "<li>";
-                               echo '<a class="lp-standard-toggle" data-toggle="collapse" href="#core-standard-'.$std['core_standard_id'].'">'.esc_html($std['core_standard_name']).' <i class="fas fa-caret-right"></i></a>';
+                               echo '<a class="lp-standard-toggle" data-bs-toggle="collapse" href="#core-standard-'.$std['core_standard_id'].'">'.esc_html($std['core_standard_name']).' <i class="fas fa-caret-right"></i></a>';
                            ?>
                            <div class="collapse tc-lp-details-standard" id="core-standard-<?php echo esc_attr($std['core_standard_id']); ?>">
                            <?php
@@ -3897,33 +3899,37 @@ function oer_allowed_html() {
 
 	global $allowedposttags;
 
-	$allowed_atts = array(
-		'align'      => array(),
-		'class'      => array(),
-		'type'       => array(),
-		'id'         => array(),
-		'dir'        => array(),
-		'lang'       => array(),
-		'style'      => array(),
-		'xml:lang'   => array(),
-		'src'        => array(),
-		'alt'        => array(),
-		'href'       => array(),
-		'rel'        => array(),
-		'rev'        => array(),
-		'target'     => array(),
-		'novalidate' => array(),
-		'type'       => array(),
-		'value'      => array(),
-		'name'       => array(),
-		'tabindex'   => array(),
-		'action'     => array(),
-		'method'     => array(),
-		'for'        => array(),
-		'width'      => array(),
-		'height'     => array(),
-		'data'       => array(),
-		'title'      => array(),
+	$allowed_atts = array(	
+		'align'      		=> array(),
+		'class'      		=> array(),
+		'type'       		=> array(),
+		'id'         		=> array(),
+		'dir'        		=> array(),
+		'lang'       		=> array(),
+		'style'      		=> array(),
+		'xml:lang'   		=> array(),
+		'src'        		=> array(),
+		'alt'        		=> array(),
+		'href'       		=> array(),
+		'rel'        		=> array(),
+		'rev'        		=> array(),
+		'target'     		=> array(),
+		'novalidate' 		=> array(),
+		'type'       		=> array(),
+		'value'      		=> array(),
+		'name'       		=> array(),
+		'tabindex'   		=> array(),
+		'action'     		=> array(),
+		'method'     		=> array(),
+		'for'        		=> array(),
+		'width'      		=> array(),
+		'height'     		=> array(),
+		'data'       		=> array(),
+		'title'      		=> array(),
+		'data-widget-type' 	=> array(),
+		'data-widget-key'	=> array(),
+		'data-sort'			=> array(),
+		'data-count'		=> array(),
 	);
 	$allowedposttags['form']     = $allowed_atts;
 	$allowedposttags['label']    = $allowed_atts;
diff --git a/includes/resource_metafields.php b/includes/resource_metafields.php
index 1a85f5f..1b7e30c 100644
--- a/includes/resource_metafields.php
+++ b/includes/resource_metafields.php
@@ -462,7 +462,7 @@ function chck_val($atr , $oer_grade)
 				}
 				?>
 				<input type="hidden" name="oer_standard" value="<?php echo esc_attr($oStandard); ?>" />
-				<button id="add-new-standard" data-toggle="modal" class="ui-button components-button is-button is-default button button-primary"><?php esc_html_e('Add Standards',OER_SLUG); ?></button>
+				<button id="add-new-standard" data-bs-toggle="modal" class="ui-button components-button is-button is-default button button-primary"><?php esc_html_e('Add Standards',OER_SLUG); ?></button>
 			</div>
 	
 		</div>
@@ -947,7 +947,7 @@ function chck_val($atr , $oer_grade)
 									?>
 								</div>
 								<input type="hidden" name="oer_related_resource" value="<?php echo esc_attr($oer_related_resource); ?>"/>
-								<button id="add-new-related-resource" data-toggle="modal" class="ui-button components-button is-button is-default button button-primary"><?php esc_html_e('Add Related Resources',OER_SLUG); ?></button>
+								<button id="add-new-related-resource" data-bs-toggle="modal" class="ui-button components-button is-button is-default button button-primary"><?php esc_html_e('Add Related Resources',OER_SLUG); ?></button>
 						</div>
 				</div>
 			</div>
diff --git a/js/back_scripts.js b/js/back_scripts.js
index f0b0fe2..ea3ca22 100644
--- a/js/back_scripts.js
+++ b/js/back_scripts.js
@@ -112,12 +112,14 @@ jQuery(document).ready(function(e) {
 	
 	if (typeof wp.data !== "undefined") {
 		wp.data.subscribe(function(){
-			var isSavingPost = wp.data.select('core/editor').isSavingPost();
-			var isAutosavingPost = wp.data.select('core/editor').isAutosavingPost();
-			
-			if (isSavingPost && !isAutosavingPost) {
-				if (typeof window.tinyMCE !== "undefined")
-					window.tinyMCE.triggerSave();
+			if (wp.data.select('core/editor')){
+				var isSavingPost = wp.data.select('core/editor').isSavingPost();
+				var isAutosavingPost = wp.data.select('core/editor').isAutosavingPost();
+				
+				if (isSavingPost && !isAutosavingPost) {
+					if (typeof window.tinyMCE !== "undefined")
+						window.tinyMCE.triggerSave();
+				}
 			}
 		});
 	}
diff --git a/js/front_scripts.js b/js/front_scripts.js
index a6c00de..a284312 100644
--- a/js/front_scripts.js
+++ b/js/front_scripts.js
@@ -69,6 +69,7 @@ jQuery(document).ready(function(e) {
 
 	setTimeout(function(){ 
         jQuery('[data-toggle="collapse"]').removeAttr('data-parent');
+        jQuery('[data-bs-toggle="collapse"]').removeAttr('data-parent');
     }, 1000);
 });
 
diff --git a/js/resource-category.js b/js/resource-category.js
index f8b26ef..d6be1dc 100644
--- a/js/resource-category.js
+++ b/js/resource-category.js
@@ -55,12 +55,18 @@ jQuery(document).ready(function(){
     jQuery('.sortoption').text(jQuery('.sort-options').find('li.cs-selected').text());
     
     jQuery('.sort-resources').click(function(){
-      jQuery('.sort-options').fadeToggle('fast');
+    	if (jQuery('.sort-options').is(":visible"))
+      	jQuery('.sort-options').fadeIn('fast');
+      else
+      	jQuery('.sort-options').fadeOut('fast');
     });
     jQuery('.sort-resources').keydown(function(e){
-	if (e.which==13 || e.which==32) {
-	    jQuery('.sort-options').fadeToggle('fast');
-	}
+			if (e.which==13 || e.which==32) {
+				if (jQuery('.sort-options').is(":visible"))
+	      	jQuery('.sort-options').fadeIn('fast');
+	      else
+	      	jQuery('.sort-options').fadeOut('fast');
+				}
     });
     
     jQuery('.sort-options ul li a').click(function(){
@@ -68,7 +74,7 @@ jQuery(document).ready(function(){
       jQuery(this).parent().addClass('cs-selected');
       jQuery('.sortoption').text(jQuery(this).text());
       jQuery('.sort-selectbox').val(jQuery(this).parent().attr('data-value'));
-      jQuery('.sort-options').fadeToggle('fast');
+      jQuery('.sort-options').fadeIn('fast');
       jQuery('.sort-selectbox').trigger("change");
     });
 });
diff --git a/oer_template/partial/content-meta.php b/oer_template/partial/content-meta.php
index 213792d..c8d7afd 100644
--- a/oer_template/partial/content-meta.php
+++ b/oer_template/partial/content-meta.php
@@ -37,7 +37,7 @@
         ?>
         <div class="form-field">
             <div class="oer-lp-label"><?php echo esc_html($citation_label); ?>:</div><div class="oer-lp-value"><?php if (strlen($citation)>230): ?>
-            <div class="oer-lp-value-excerpt"><?php echo wp_kses_post(oer_get_content( $citation, 230)); ?></div>
+            <div class="oer-lp-value-excerpt"><?php echo oer_get_content( $citation, 230); ?></div>
             <div class="oer-lp-value-full"><?php echo wp_kses($citation,$allowed_tags); ?>  <a href="javascript:void(0);" class="lp-read-less">(read less)</a></div>
             <?php
             else: 
@@ -57,7 +57,7 @@
         ?>
         <div class="form-field">
             <div class="oer-lp-label"><?php echo esc_html($transcription_label); ?>:</div><div class="oer-lp-value"><?php if (strlen($transcription)>230): ?>
-            <div class="oer-lp-value-excerpt"><?php echo wp_kses_post(oer_get_content( $transcription, 230)); ?></div>
+            <div class="oer-lp-value-excerpt"><?php echo oer_get_content( $transcription, 230); ?></div>
             <div class="oer-lp-value-full"><?php echo wp_kses($transcription,$allowed_tags); ?> <a href="javascript:void(0);" class="lp-read-less">(read less)</a></div>
             <?php
             else: 
@@ -77,7 +77,7 @@
         ?>
         <div class="form-field">
             <div class="oer-lp-label oer-lp-red"><?php echo esc_html($sensitive_material_label); ?>:</div> <div class="oer-lp-value oer-lp-red"><?php if (strlen($sensitive_material)>230): ?>
-            <div class="oer-lp-value-excerpt"><?php echo wp_kses_post(oer_get_content( $sensitive_material, 230)); ?></div>
+            <div class="oer-lp-value-excerpt"><?php echo oer_get_content( $sensitive_material, 230); ?></div>
             <div class="oer-lp-value-full"><?php echo wp_kses($sensitive_material,$allowed_tags); ?>  <a href="javascript:void(0);" class="lp-read-less">(read less)</a></div>
             <?php
             else: 
diff --git a/oer_template/single-resource-audio.php b/oer_template/single-resource-audio.php
index cd21f94..a30c1e0 100644
--- a/oer_template/single-resource-audio.php
+++ b/oer_template/single-resource-audio.php
@@ -1,15 +1,24 @@
 <?php /** Website/Image/Document(except PDF)/Other Resource Template **/ 
+
 $allowed_tags = oer_allowed_html();
+
+// Checks if display more button should be displayed
+if (!empty($grade_levels) || !empty($grades) || !empty($suggested_time)
+    || !empty($cc_license) || !empty($external_repository) || !empty($repository_record)
+    || !empty($citation) || !empty($transcription) || !empty($sensitive_material))
+    $display_see_more = true;
 ?>
 <div class="oer-rsrclftcntr-img col-md-5 col-sm-12 col-xs-12">
     <!--Resource Image-->
     <div class="oer-sngl-rsrc-img oer-sngl-audio-type">
         <?php
         $type=oer_get_resource_file_type($url);
-        if ($type['name']=="Audio")
-            echo oer_generate_audio_resource_embed($url);
-        else
-            echo oer_display_default_thumbnail($post);
+        if (is_array($type)){
+            if ($type['name']=="Audio")
+                echo oer_generate_audio_resource_embed($url);
+            else
+                echo oer_display_default_thumbnail($post);
+        }
         ?>
     </div>
     <div id="" class="oer-authorName oer-cbxl">
@@ -126,7 +135,7 @@
                     else
                         echo '<li>'.wp_kses($subject,$allowed_tags).'</li>';
                     if (($i==2) && ($cnt>2))
-                        echo '<li><a class="see-more-subjects" data-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
+                        echo '<li><a class="see-more-subjects" data-bs-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
                     $i++;
                 }
                 ?>
@@ -157,7 +166,7 @@
                     else
                         echo "<li><a href='".esc_url($curriculum_url)."'>".esc_html($curriculum['post_title'])."</a></li>";
                     if (($i==2) && ($cnt>2))
-                        echo '<li><a class="see-more-subjects" data-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
+                        echo '<li><a class="see-more-subjects" data-bs-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
                     $i++;
                 }
                 ?>
@@ -169,7 +178,7 @@
 </div> <!--Description & Resource Info at Right-->
 <?php  if ($display_see_more): ?>
 <div class="oer-see-more-row col-md-12 col-sm-12 col-xs-12">
-    <p class="center"><span><a id="oer-see-more-link" class="oer-see-more-link" role="button" data-toggle="collapse" href="#tcHiddenFields" aria-expanded="false" aria-controls="tcHiddenFields"><?php esc_html_e("SEE MORE +",OER_SLUG); ?></a></span></p>
+    <p class="center"><span><a id="oer-see-more-link" class="oer-see-more-link" role="button" data-bs-toggle="collapse" href="#tcHiddenFields" aria-expanded="false" aria-controls="tcHiddenFields"><?php esc_html_e("SEE MORE +",OER_SLUG); ?></a></span></p>
 </div>
 <?php endif; ?>
 <div id="tcHiddenFields" class="tc-hidden-fields collapse row col-md-12 col-sm-12 col-xs-12">
diff --git a/oer_template/single-resource-pdf.php b/oer_template/single-resource-pdf.php
index 3d6ea87..e6bb267 100644
--- a/oer_template/single-resource-pdf.php
+++ b/oer_template/single-resource-pdf.php
@@ -1,5 +1,10 @@
 <?php /** PDF Resource Template **/ 
 $allowed_tags = oer_allowed_html();
+
+// Checks if display more button should be displayed
+if (!empty($external_repository) || !empty($repository_record)
+    || !empty($citation) || !empty($transcription) || !empty($sensitive_material))
+    $display_see_more = true;
 ?>
 <div class="oer-rsrclftcntr-img col-md-7 col-sm-12 col-xs-12">
     <!--Resource Image-->
@@ -170,7 +175,7 @@
                     else
                         echo '<li>'.wp_kses($subject,$allowed_tags).'</li>';
                     if (($i==2) && ($cnt>2))
-                        echo '<li><a class="see-more-subjects" data-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
+                        echo '<li><a class="see-more-subjects" data-bs-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
                     $i++;
                 }
                 ?>
@@ -201,7 +206,7 @@
                     else
                         echo "<li><a href='".esc_url($curriculum_url)."'>".esc_html($curriculum['post_title'])."</a></li>";
                     if (($i==2) && ($cnt>2))
-                        echo '<li><a class="see-more-subjects" data-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
+                        echo '<li><a class="see-more-subjects" data-bs-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
                     $i++;
                 }
                 ?>
@@ -217,7 +222,7 @@
 </div> <!--Description & Resource Info at Right-->
 <?php  if ($display_see_more): ?>
 <div class="oer-see-more-row col-md-12 col-sm-12 col-xs-12">
-    <p class="center"><span><a id="oer-see-more-link" class="oer-see-more-link" role="button" data-toggle="collapse" href="#tcHiddenFields" aria-expanded="false" aria-controls="tcHiddenFields"><?php esc_html_e("SEE MORE +",OER_SLUG); ?></a></span></p>
+    <p class="center"><span><a id="oer-see-more-link" class="oer-see-more-link" role="button" data-bs-toggle="collapse" href="#tcHiddenFields" aria-expanded="false" aria-controls="tcHiddenFields"><?php esc_html_e("SEE MORE +",OER_SLUG); ?></a></span></p>
 </div>
 <?php endif; ?>
 <div id="tcHiddenFields" class="tc-hidden-fields collapse row col-md-12 col-sm-12 col-xs-12">
diff --git a/oer_template/single-resource-standard.php b/oer_template/single-resource-standard.php
index a8fcf7f..6272194 100644
--- a/oer_template/single-resource-standard.php
+++ b/oer_template/single-resource-standard.php
@@ -1,4 +1,5 @@
 <?php
+
 $post_meta_data = get_post_meta($post->ID );
 $author_set = (get_option('oer_authorname_label'))?true:false;
 $author_enabled = (get_option('oer_authorname_enabled'))?true:false;
@@ -22,6 +23,12 @@
 $sensitive_material_set = (get_option('oer_sensitive_material_label'))?true:false;
 $sensitive_material_enabled = (get_option('oer_sensitive_material_enabled'))?true:false;
 $allowed_tags = oer_allowed_html();
+
+// Checks if display more button should be displayed
+if (!empty($grade_levels) || !empty($grades) || !empty($suggested_time)
+    || !empty($cc_license) || !empty($external_repository) || !empty($repository_record)
+    || !empty($citation) || !empty($transcription) || !empty($sensitive_material))
+    $display_see_more = true;
 ?>
 <div class="oer-rsrclftcntr-img col-md-5 col-sm-12 col-xs-12">
     <!--Resource Image-->
@@ -81,10 +88,12 @@
             }
         } else {
             $type=oer_get_resource_file_type($url);
-            if ($type['name']=="Video"){
-                echo oer_embed_video_file($url, $type['type']);
-            } else {
-                echo oer_display_default_thumbnail($post);
+            if (is_array($type)){
+                if ($type['name']=="Video"){
+                    echo oer_embed_video_file($url, $type['type']);
+                } else {
+                    echo oer_display_default_thumbnail($post);
+                }
             }
         }
         if ($embed_disabled){
@@ -206,7 +215,7 @@
                     else
                         echo '<li>'.wp_kses($subject,$allowed_tags).'</li>';
                     if (($i==2) && ($cnt>2))
-                        echo '<li><a class="see-more-subjects" data-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
+                        echo '<li><a class="see-more-subjects" data-bs-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
                     $i++;
                 }
                 ?>
@@ -237,7 +246,7 @@
                     else
                         echo "<li><a href='".esc_url($curriculum_url)."'>".esc_html($curriculum['post_title'])."</a></li>";
                     if (($i==2) && ($cnt>2))
-                        echo '<li><a class="see-more-subjects" data-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
+                        echo '<li><a class="see-more-subjects" data-bs-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
                     $i++;
                 }
                 ?>
@@ -249,7 +258,7 @@
 </div> <!--Description & Resource Info at Right-->
 <?php  if ($display_see_more): ?>
 <div class="oer-see-more-row col-md-12 col-sm-12 col-xs-12">
-    <p class="center"><span><a id="oer-see-more-link" class="oer-see-more-link" role="button" data-toggle="collapse" href="#tcHiddenFields" aria-expanded="false" aria-controls="tcHiddenFields"><?php esc_html_e("SEE MORE +",OER_SLUG); ?></a></span></p>
+    <p class="center"><span><a id="oer-see-more-link" class="oer-see-more-link" role="button" data-bs-toggle="collapse" href="#tcHiddenFields" aria-expanded="false" aria-controls="tcHiddenFields"><?php esc_html_e("SEE MORE +",OER_SLUG); ?></a></span></p>
 </div>
 <?php endif; ?>
 <div id="tcHiddenFields" class="tc-hidden-fields collapse row col-md-12 col-sm-12 col-xs-12">
diff --git a/oer_template/single-resource-video.php b/oer_template/single-resource-video.php
index 1d0e9bf..513321c 100644
--- a/oer_template/single-resource-video.php
+++ b/oer_template/single-resource-video.php
@@ -1,11 +1,19 @@
 <?php /** Video Resource Template **/ 
+
 $allowed_tags = oer_allowed_html();
+
+// Checks if display more button should be displayed
+if (!empty($external_repository) || !empty($repository_record)
+    || !empty($citation) || !empty($transcription) || !empty($sensitive_material))
+    $display_see_more = true;
 ?>
 <div class="oer-rsrclftcntr-video col-md-12 col-sm-12 col-xs-12">    
         <?php
         $type=oer_get_resource_file_type($url);
-        if ($type['name']=="Video")
-            echo oer_embed_video_file($url, $type['type']);
+        if (is_array($type)){
+            if ($type['name']=="Video")
+                echo oer_embed_video_file($url, $type['type']);
+        }
         ?>
 </div>
 <div class="oer-rsrccntr-details col-md-12 col-sm-12 col-xs-12">
@@ -130,7 +138,7 @@
                         else
                             echo '<li>'.wp_kses($subject,$allowed_tags).'</li>';
                         if (($i==2) && ($cnt>2))
-                            echo '<li><a class="see-more-subjects" data-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
+                            echo '<li><a class="see-more-subjects" data-bs-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
                         $i++;
                     }
                     ?>
@@ -161,7 +169,7 @@
                         else
                             echo "<li><a href='".esc_url($curriculum_url)."'>".esc_html($curriculum['post_title'])."</a></li>";
                         if (($i==2) && ($cnt>2))
-                            echo '<li><a class="see-more-subjects" data-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
+                            echo '<li><a class="see-more-subjects" data-bs-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
                         $i++;
                     }
                     ?>
@@ -173,7 +181,7 @@
 </div>
 <?php  if ($display_see_more): ?>
 <div class="oer-see-more-row col-md-12 col-sm-12 col-xs-12">
-    <p class="center"><span><a id="oer-see-more-link" class="oer-see-more-link" role="button" data-toggle="collapse" href="#tcHiddenFields" aria-expanded="false" aria-controls="tcHiddenFields"><?php esc_html_e("SEE MORE +",OER_SLUG); ?></a></span></p>
+    <p class="center"><span><a id="oer-see-more-link" class="oer-see-more-link" role="button" data-bs-toggle="collapse" href="#tcHiddenFields" aria-expanded="false" aria-controls="tcHiddenFields"><?php esc_html_e("SEE MORE +",OER_SLUG); ?></a></span></p>
 </div>
 <?php endif; ?>
 <div id="tcHiddenFields" class="tc-hidden-fields collapse row col-md-12 col-sm-12 col-xs-12">
diff --git a/oer_template/single-resource-website.php b/oer_template/single-resource-website.php
index e31bbc5..86679f7 100644
--- a/oer_template/single-resource-website.php
+++ b/oer_template/single-resource-website.php
@@ -1,5 +1,11 @@
 <?php /** Website/Image/Document(except PDF)/Other Resource Template **/ 
 $allowed_tags = oer_allowed_html();
+
+// Checks if display more button should be displayed
+if (!empty($grade_levels) || !empty($grades) || !empty($suggested_time)
+    || !empty($cc_license) || !empty($external_repository) || !empty($repository_record)
+    || !empty($citation) || !empty($transcription) || !empty($sensitive_material))
+    $display_see_more = true;
 ?>
 
 <div class="oer-rsrclftcntr-img col-md-5 col-sm-12 col-xs-12">
@@ -121,7 +127,7 @@
                     else
                         echo '<li>'.wp_kses($subject,$allowed_tags).'</li>';
                     if (($i==2) && ($cnt>2))
-                        echo '<li><a class="see-more-subjects" data-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
+                        echo '<li><a class="see-more-subjects" data-bs-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
                     $i++;
                 }
                 ?>
@@ -152,7 +158,7 @@
                     else
                         echo "<li><a href='".esc_url($curriculum_url)."'>".esc_html($curriculum['post_title'])."</a></li>";
                     if (($i==2) && ($cnt>2))
-                        echo '<li><a class="see-more-subjects" data-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
+                        echo '<li><a class="see-more-subjects" data-bs-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
                     $i++;
                 }
                 ?>
@@ -164,7 +170,7 @@
 </div> <!--Description & Resource Info at Right-->
 <?php  if ($display_see_more): ?>
 <div class="oer-see-more-row col-md-12 col-sm-12 col-xs-12">
-    <p class="center"><span><a id="oer-see-more-link" class="oer-see-more-link" role="button" data-toggle="collapse" href="#tcHiddenFields" aria-expanded="false" aria-controls="tcHiddenFields"><?php esc_html_e("SEE MORE +",OER_SLUG); ?></a></span></p>
+    <p class="center"><span><a id="oer-see-more-link" class="oer-see-more-link" role="button" data-bs-toggle="collapse" href="#tcHiddenFields" aria-expanded="false" aria-controls="tcHiddenFields"><?php esc_html_e("SEE MORE +",OER_SLUG); ?></a></span></p>
 </div>
 <?php endif; ?>
 <div id="tcHiddenFields" class="tc-hidden-fields collapse row col-md-12 col-sm-12 col-xs-12">
diff --git a/oer_template/single-resource-youtube.php b/oer_template/single-resource-youtube.php
index b19a672..3784743 100644
--- a/oer_template/single-resource-youtube.php
+++ b/oer_template/single-resource-youtube.php
@@ -1,4 +1,11 @@
-<?php $allowed_tags = oer_allowed_html();  ?>
+<?php 
+$allowed_tags = oer_allowed_html();  
+
+// Checks if display more button should be displayed
+if (!empty($external_repository) || !empty($repository_record)
+    || !empty($citation) || !empty($transcription) || !empty($sensitive_material))
+    $display_see_more = true;
+?>
 <div class="oer-rsrclftcntr-video col-md-12 col-sm-12 col-xs-12">    
         <?php
         if ($youtube){
@@ -142,7 +149,7 @@
                         else
                             echo '<li>'.wp_kses($subject,$allowed_tags).'</li>';
                         if (($i==2) && ($cnt>2))
-                            echo '<li><a class="see-more-subjects" data-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
+                            echo '<li><a class="see-more-subjects" data-bs-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
                         $i++;
                     }
                     ?>
@@ -173,7 +180,7 @@
                         else
                             echo "<li><a href='".esc_url($curriculum_url)."'>".esc_html($curriculum['post_title'])."</a></li>";
                         if (($i==2) && ($cnt>2))
-                            echo '<li><a class="see-more-subjects" data-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
+                            echo '<li><a class="see-more-subjects" data-bs-toggle="collapse" data-count="'.esc_attr($moreCnt).'" href=".lp-subject-hidden">SEE '.esc_html($moreCnt).' MORE +</a></li>';
                         $i++;
                     }
                     ?>
@@ -185,7 +192,7 @@
 </div>
 <?php  if ($display_see_more): ?>
 <div class="oer-see-more-row col-md-12 col-sm-12 col-xs-12">
-    <p class="center"><span><a id="oer-see-more-link" class="oer-see-more-link" role="button" data-toggle="collapse" href="#tcHiddenFields" aria-expanded="false" aria-controls="tcHiddenFields"><?php esc_html_e("SEE MORE +",OER_SLUG); ?></a></span></p>
+    <p class="center"><span><a id="oer-see-more-link" class="oer-see-more-link" role="button" data-bs-toggle="collapse" href="#tcHiddenFields" aria-expanded="false" aria-controls="tcHiddenFields"><?php esc_html_e("SEE MORE +",OER_SLUG); ?></a></span></p>
 </div>
 <?php endif; ?>
 <div id="tcHiddenFields" class="tc-hidden-fields collapse row col-md-12 col-sm-12 col-xs-12">
diff --git a/oer_template/single-resource.php b/oer_template/single-resource.php
index fca4274..d47b852 100644
--- a/oer_template/single-resource.php
+++ b/oer_template/single-resource.php
@@ -157,11 +157,6 @@
     'sensitive_material_set' => $sensitive_material_set,
     'sensitive_material_enabled' => $sensitive_material_enabled
 );
-
-if (!empty($age_levels) || !empty($grades) || !empty($suggested_time)
-    || !empty($cc_license) || !empty($external_repository) || !empty($repository_record)
-    || !empty($citation) || !empty($transcription) || !empty($sensitive_material))
-    $display_see_more = true;
 ?>
 <!--<div id="primary" class="content-area">-->
     <main id="oer_main" class="site-main" role="main">
@@ -188,10 +183,12 @@
 			case "other":
 			case "image":
 				$oer_type=oer_get_resource_file_type($url);
-				if ($oer_type['name']=="PDF")
-				    $resource_template = OER_PATH.'oer_template/single-resource-pdf.php';
-				else
-				    $resource_template = OER_PATH.'oer_template/single-resource-website.php';
+				if (is_array($oer_type)){
+					if ($oer_type['name']=="PDF")
+					    $resource_template = OER_PATH.'oer_template/single-resource-pdf.php';
+					else
+					    $resource_template = OER_PATH.'oer_template/single-resource-website.php';
+				}
 				break;
 			case "audio":
 				$oer_type=oer_get_resource_file_type($url);
diff --git a/open-educational-resources.php b/open-educational-resources.php
index 4a12166..43cbf9c 100644
--- a/open-educational-resources.php
+++ b/open-educational-resources.php
@@ -3,7 +3,7 @@
  Plugin Name:        WP OER
  Plugin URI:         https://www.wp-oer.com
  Description:        Open Educational Resource management and curation, metadata publishing, and alignment to Common Core State Standards.
- Version:            0.9.1
+ Version:            0.9.2
  Requires at least:  4.4
  Requires PHP:       7.0
  Author:             Navigation North
@@ -38,7 +38,7 @@
 // Plugin Name and Version
 define( 'OER_PLUGIN_NAME', 'WP OER Plugin' );
 define( 'OER_ADMIN_PLUGIN_NAME', 'WP OER Plugin');
-define( 'OER_VERSION', '0.9.1' );
+define( 'OER_VERSION', '0.9.2' );
 define( 'OER_SITE_PATH', ABSPATH );
 
 include_once(OER_PATH.'includes/oer-functions.php');
diff --git a/readme.txt b/readme.txt
index b7a663f..34b6ea7 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,9 +2,9 @@
 Contributors: navigationnorth, joehobson, johnpaulbalagolan, josepheneldas, arobotnamedchris
 Tags: OER, Open Educational Resources, Education, Teaching, Learning
 Requires at least: 4.4
-Tested up to: 6.0
+Tested up to: 6.0.2
 Requires PHP: 7.0
-Stable tag: 0.9.1
+Stable tag: 0.9.2
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -41,6 +41,12 @@ No frequently asked questions.
 3. Display educational resources on your WordPress website!
 
 == Changelog ==
+= 0.9.2 =
+* Fixed the overlapping text on the settings and import pages including the standard list display
+* Fixed the Resource Block display error when the resource has no selected subject areas
+* Fixed the front-end issue on Subject Resources block sorting and display count
+* Tested up to WP 6.0.2
+
 = 0.9.1 =
 * Replaced move_uploaded_file with wp_handle_upload function when importing subject areas and resources
 * Removed quote around string placeholders used in $wpdb->prepare statements