added spotify uri search, some cleanup