and fix displaying empty labels