Fix circular inclusion of mpd.h in search.h
Add two new tasks