Fixed missing indexes errors