Should be working with the new backend endpoint