Big reworking for content <= vigneron,vin and search