tag/purging-improvements