diff --git a/formats/datatables/QuerySegmentListProcessor.php b/formats/datatables/QuerySegmentListProcessor.php
index acb24061..1ca726f5 100644
--- a/formats/datatables/QuerySegmentListProcessor.php
+++ b/formats/datatables/QuerySegmentListProcessor.php
@@ -87,7 +87,7 @@ public function setQuerySegmentList( &$querySegmentList ) {
 	/**
 	 * @since 2.2
 	 *
-	 * @param integer $queryMode
+	 * @param int $queryMode
 	 */
 	public function setQueryMode( $queryMode ) {
 		$this->queryMode = $queryMode;
@@ -165,7 +165,7 @@ private function table( QuerySegment &$query ) {
 
 				$this->fromTables[$subQuery->alias] = $joinTable;
 
-				ksort($this->fromTables);
+				ksort( $this->fromTables );
 				$this->joinConditions[$subQuery->alias] = [ $joinType . ' JOIN', "$joinField$op=" . $subQuery->joinfield ];
 
 				$query->from .= " $joinType JOIN $t ON $joinField$op=" . $subQuery->joinfield;
@@ -387,5 +387,4 @@ public function cleanUp() {
 			$this->temporaryTableBuilder->drop( $this->connection->tableName( $table ) );
 		}
 	}
-
 }
diff --git a/formats/datatables/SearchPanes.php b/formats/datatables/SearchPanes.php
index 13689bc1..4cdfba65 100644
--- a/formats/datatables/SearchPanes.php
+++ b/formats/datatables/SearchPanes.php
@@ -11,7 +11,6 @@
 
 namespace SRF\DataTables;
 
-use DataItem as SMWDataItem;
 use SMW\DataTypeRegistry;
 use SMW\DataValueFactory;
 use SMW\DIProperty;
@@ -28,7 +27,7 @@
 use SRF\DataTables;
 
 class SearchPanes {
-	/** @const DataTables */
+	/** @var DataTables */
 	private $datatables;
 
 	private array $searchPanesLog = [];
@@ -696,7 +695,7 @@ private function searchPanesMainlabel( PrintRequest $printRequest, array $search
 		];
 
 		if ( $threshold < 1 ) {
-		 	return [];
+			return [];
 		}
 
 		$query = $this->datatables->query;
@@ -721,7 +720,7 @@ private function searchPanesMainlabel( PrintRequest $printRequest, array $search
 
 		$tables = $querySegmentListProcessor->fromTables;
 		$joins = $querySegmentListProcessor->joinConditions;
-		
+
 		$tables[$qobj->alias] = $qobj->joinTable;
 
 		$conds = $qobj->where;
@@ -754,12 +753,12 @@ private function searchPanesMainlabel( PrintRequest $printRequest, array $search
 		$joins_ = $joins;
 
 		$res = $this->connection->select(
-    		$tables_,
-    		$fields_,
-    		$conds_,
-    		__METHOD__,
-    		$sql_options_,
-    		$joins_
+			$tables_,
+			$fields_,
+			$conds_,
+			__METHOD__,
+			$sql_options_,
+			$joins_
 		);
 
 		$diHandler = $this->datatables->store->getDataItemHandlerForDIType(