Topic/fix nb sort

Fixes filters OR -> AND and sort order of list view