improved Item filters, fixed #25