bugfixes in queryService and song
merged song-classes