Improve metadata handling to prevent artwork appearing and disappearing