Update command-line to accept start/end delimiter tags