Plugin-Tag improvements: