Issue #1875042 by MagicMcj: Use tagged dynamic query to let other modules alter the conflicting results set