Revised ID filter

I think it works...