Refactored site filter