issue #21395: Fix collections not to use stale queries.

Issue #21835: Back port parameter widget fix.