Update query to use r.radar_id