added type filter