Fix error and no data display