Update and fix MovieSelection