Issue #20866: Fixed filtering bugs and refresh on collection changed.