Include DAAP queries from Retune and TunesRemote+ for caching
+ misc fixing up