fix views with new data model