SONAR-4921 Replace deletion of baseId condition by a replacement of the baseId condition by base condition