Corrected automatic build tags adding plugin wrapper sections