entities fixes to work under Iris API