Implemented proper handling of new API in client code; fixed server not sending requested Entity.