Improve urgency filter