WP-1571: Events, filter navigation -- UPDATE2.