Removed track check as it breaks things - artist check should suffice