Fix musicbrainz encoding, add TMDB and add removal intents