Cleanup filter initialization improvement
Merge pull request #405 from dromagnoli/cleanupfilter

Cleanup filter initialization improvement