Fix tag and goto command.