allow nested conditionals in frame filter
Merge pull request #561 from demaagdk/develop

allow nested conditionals in frame filter