Fix edit tag and empty tag