Tidy up putting full tags set for package