Bugfix. Filter out empty nivaa