Fixed indexer and file upload