Filter fixes
Don't refresh twice in some cases