SONAR-4326 Fix case when no tag is defined (i.e current state for most installs)