Updated filter creation.
Improved script generation
Merge branch 'test' into dev