Code refactoring, added search of songs