Added new filter for types