diff --git a/admin/hooks/post-thumbnail-html.php b/admin/hooks/post-thumbnail-html.php
index e3cb8085..3ed6fdfb 100644
--- a/admin/hooks/post-thumbnail-html.php
+++ b/admin/hooks/post-thumbnail-html.php
@@ -1,6 +1,6 @@
 <?php
 function sportspress_post_thumbnail_html( $html, $post_id, $post_thumbnail_id, $size, $attr ) {
-    if( empty ( $html ) && in_array( get_post_type( $post_id ), array( 'sp_team', 'sp_tournament' ) ) ) {
+    if( empty ( $html ) && get_post_type( $post_id ) == 'sp_team' ) {
 		$parents = get_post_ancestors( $post_id );
 		foreach ( $parents as $parent ) {
 			if( has_post_thumbnail( $parent ) ) {
diff --git a/admin/hooks/the-content.php b/admin/hooks/the-content.php
index 1e807908..e6779b99 100644
--- a/admin/hooks/the-content.php
+++ b/admin/hooks/the-content.php
@@ -13,10 +13,12 @@ function sportspress_default_event_content( $content ) {
         $results = sportspress_event_results();
         $players = sportspress_event_players();
         $staff = sportspress_event_staff();
-        if ( is_array( $results ) && array_filter( $results, 'array_filter' ) )
-            return $results . $details . $players . $staff . $content;
-        $venue = sportspress_event_venue();
-        $content = $details . $venue . $players . $staff . $content;
+        if ( $results ):
+            $content = $results . $details . $players . $staff . $content;
+        else:
+            $venue = sportspress_event_venue();
+            $content = $details . $venue . $players . $staff . $content;
+        endif;
     endif;
     return $content;
 }
diff --git a/admin/templates/event-results.php b/admin/templates/event-results.php
index 81141921..6e907b33 100644
--- a/admin/templates/event-results.php
+++ b/admin/templates/event-results.php
@@ -16,6 +16,9 @@ if ( !function_exists( 'sportspress_event_results' ) ) {
 
 		$i = 0;
 
+		if ( empty( array_filter( $results, 'array_filter' ) ) )
+			return false;
+
 		foreach( $results as $team_id => $result ):
 			if ( sportspress_array_value( $result, 'outcome', '-1' ) != '-1' ):
 
@@ -43,7 +46,11 @@ if ( !function_exists( 'sportspress_event_results' ) ) {
 			endif;
 		endforeach;
 
-		if ( ! empty( $table_rows ) ):
+		if ( empty( $table_rows ) ):
+
+			return false;
+
+		else:
 
 			$output .= '<h3>' . __( 'Results', 'sportspress' ) . '</h3>';
 
diff --git a/admin/templates/event-venue.php b/admin/templates/event-venue.php
index 55adc85c..683899de 100644
--- a/admin/templates/event-venue.php
+++ b/admin/templates/event-venue.php
@@ -22,7 +22,7 @@ if ( !function_exists( 'sportspress_event_venue' ) ) {
 			$longitude = sportspress_array_value( $term_meta, 'sp_longitude', 0 );
 		
 			$output .= '<h3>' . __( 'Venue', 'sportspress' ) . '</h3>';
-			$output .= '<p>' . $venue->name . '<br><small>' . $address . '</small></p>';
+			$output .= '<p><a href="' . get_term_link( $t_id, 'sp_venue' ) . '">' . $venue->name . '</a><br><small>' . $address . '</small></p>';
 			if ( $latitude != null && $longitude != null )
 				$output .= '<div class="sp-google-map" data-address="' . $address . '" data-latitude="' . $latitude . '" data-longitude="' . $longitude . '"></div>';