Changed filter/sink type checks.