Refactoring. Removing super_archives.queries