Fix for saving views
move todo list into JIRA