fixed no data found issue