Make NDBC collector actually work for raw requests