Added modification for empty tag