Fix datasource to set param events correctly