Fixing params vs data usage in client.