Filter-mapping fix