CLA-807 Keep check for no tags