Fix: Filter on status