Fix to only trigger data event when fields ro filters change