Handle default filter options better.