Check out my (paid for) Advanced Song Chooser extension:
I also have a basic free version you can try out first.