Fix tag behaviour for many tags based on technical demo