feat(filters): Improve filters switch