Fixed issue with data views