some entities fixes to work under API