Add MPD search, and a couple utility methods