Fix the code that abuse c21 HTTP network (since it request to it per now-playing client request)
Merge