Issue #25: Filter on the current site