Movie index and storage tweaks