Fix handling saved views
Fix handling saved views