Fixed Artist search & cleanup