SONAR-5666 SONAR-5697 Add missing DeleteByQuery