Tidy up imports
Replace artist serch with code from the module