LPS-37801 make consistent the "portal data level" data handlers