DEVIDM-109: view fixes