Add saving with filter

And few bugs around