fixed server side data collection