Fixed labels showing null/undefined strings