bugfixing and rewrite in MovieController