SONAR-5007 SONAR-5326 SONAR-5136 Use completion for tags