Fix data query consistincy