MDL-23979 fixed non standard entities result