Issue #8 - Changed filter UI.