Fix the type filter to use the real _type!