close #27 - Adding Filter for auditing purposes