Fix filtering when selecting only nivaa