fix for legacy filter format
cleanup
testing
fix
Merge pull request #562 from demaagdk/develop

Develop