Fix empty tag field problem