Quick fix for crashes when mpd stops
Initial working by-label functionality
Remove comments