added some filter more types