Fixing issue where entries would show if empty