OOPS. This approach broke filtering on the first-round, too. Need to find another way.