Further tweaking of filtering and navigation