Fix simple set navigation