Added filtering for staff