Made the search more generic, removed dependencies to spotify related thing to allow for reuse