Solved minor bug with SongList, now search in favourite works properly, refactor some code due tu redundant portion of code