bugfix for search songs overlap.
Also removing unused imports and fixing formatting.