dynamic query rule:fix issues in comments