Fast empty tag fix