fix selection, persist full vs schema view state