updated navigation with more filtering