add better tag and message handling for command completions