[AW-590] fixes basic data view