Refactore for relevant filters by tag