code: added "AnyEnabled" check for movies and ...

... also do a code cleanup