Improved the catch-all behavior