Fixes to setting filter and saving