Fix for tagging with a value on singularized tag context