Made tagging worker smarter about shutdown