Added main type filter