Fix some issues, remove duplicate code from discogs_tagger, first step to rebuild discogs_tagger calling script