diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 77d70e9..1e7ba2e 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -62,7 +62,7 @@ final class ApiController extends Controller
     public function apiMediaUpload(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         $uploads = $this->uploadFiles(
-            $request->getData('name') === null || $request->getFiles() !== null ? '' : $request->getData('name'),
+            $request->getData('name') === null || \count($request->getFiles()) > 1 ? '' : $request->getData('name'),
             $request->getFiles(),
             $request->header->account,
             __DIR__ . '/../../../Modules/Media/Files' . \urldecode((string) ($request->getData('path') ?? '')),
diff --git a/Models/Collection.php b/Models/Collection.php
index 30a7e31..4391d0e 100755
--- a/Models/Collection.php
+++ b/Models/Collection.php
@@ -27,7 +27,7 @@ class Collection extends Media implements \Iterator
     /**
      * Resource id.
      *
-     * @var Media[]
+     * @var array<int, Media>
      * @since 1.0.0
      */
     private array $sources = [];
@@ -113,7 +113,7 @@ class Collection extends Media implements \Iterator
     /**
      * {@inheritdoc}
      */
-    public function current()
+    public function current() : Media
     {
         return \current($this->sources);
     }
@@ -121,7 +121,7 @@ class Collection extends Media implements \Iterator
     /**
      * {@inheritdoc}
      */
-    public function key()
+    public function key() : ?int
     {
         return \key($this->sources);
     }
diff --git a/Models/CollectionMapper.php b/Models/CollectionMapper.php
index 08b9c4f..aaea1f7 100755
--- a/Models/CollectionMapper.php
+++ b/Models/CollectionMapper.php
@@ -120,18 +120,19 @@ final class CollectionMapper extends MediaMapper
      *
      * @since 1.0.0
      */
-    public static function getCollectionsByPath(string $path, bool $showDirectories = false) : array
+    public static function getCollectionsByPath(string $virtualPath, bool $showDirectories = false) : array
     {
-        $collection = self::getByVirtualPath($path);
+        /** @var Media[] $collection */
+        $collection = self::getByVirtualPath($virtualPath);
         $parent     = [];
 
         if ($showDirectories) {
-            $parent = self::getParentCollection($path);
-            if (\is_array($parent) && \is_dir(__DIR__ . '/../../Media/Files' . $path)) {
+            $parent = self::getParentCollection($virtualPath);
+            if (\is_array($parent) && \is_dir(__DIR__ . '/../../Media/Files' . $virtualPath)) {
                 $parent       = new Collection();
-                $parent->name = \basename($path);
-                $parent->setVirtualPath(\dirname($path));
-                $parent->setPath(\dirname($path));
+                $parent->name = \basename($virtualPath);
+                $parent->setVirtualPath(\dirname($virtualPath));
+                $parent->setPath(\dirname($virtualPath));
                 $parent->isAbsolute = false;
             }
 
@@ -165,7 +166,7 @@ final class CollectionMapper extends MediaMapper
                     $localMedia            = new Collection();
                     $localMedia->name      = $pathinfo['filename'];
                     $localMedia->extension = \is_dir($file) ? 'collection' : $pathinfo['extension'] ?? '';
-                    $localMedia->setVirtualPath($path);
+                    $localMedia->setVirtualPath($virtualPath);
                     $localMedia->createdBy = new Account();
 
                     $collection[] = $localMedia;