Fixes for default filters not set correctly