Commit #30 Specialty filtering