Advanced music search rework

by meza