[MovieSelection] some fixes and cleanup.