remove context objects when cleaning
keep results on filters
Merge pull request #614 from demaagdk/develop

Develop