MediaLibrary speedup part 2