Extended sample and fixed small bug in supplements that caused local supplements to appear in upstream