Version 5.0.0 release

system/Content/Search/Elastic/Query.php

@@ -116,7 +116,7 @@ class Query extends SearchQuery
 		foreach ( $contentFilters as $filter )
 		{
 			$conditions = array();
-			if ( $type )
+			if ( $type and !empty( $filter->itemClass ) )
 			{
 				$this->itemClasses[] = $filter->itemClass;
 			}

system/Content/Search/Results.php

@@ -210,7 +210,7 @@ class Results extends ArrayIterator
 				}
 			}
 			
-			if ( method_exists( $itemClass, 'searchResultExtraData' ) )
+			if ( method_exists( $itemClass, 'searchResultExtraData' ) and !empty( $this->itemData[ $itemClass ] ) )
 			{
 				foreach ( $itemClass::searchResultExtraData( $this->itemData[ $itemClass ] ) as $id => $extraData )
 				{