Fix indicator lists