Fix: file-manager indexer + some small fixes