FIX: shutdown_handler needs to include tags. Regression introduced by 812cc53524