Disc ID and Track ID are now found if missing, using recording id and song title.
Removed a few redundant checks.