Improve speed tagging.