Querying data update fix