Some Code improvments

Resolved Bug: Movie.nfo not found in method "search"
improvments: doubled code deleted