initial work on #317 lang tag support