Terminal tagging works for all kinds of terminals

refs #39